Fix builder

Author: naimsolong

config/data-extractor.php

@@ -34,9 +34,4 @@
             'disk' => 'local',
         ],
     ],
-
-    'sanitize' => [
-        'password',
-        'remember_token',
-    ],
 ];

src/Builder/CsvBuilder.php

@@ -15,15 +15,17 @@ public function build(): string
         $csv .= implode(',', $this->columns)."\n";
 
         // Add data rows
-        foreach ($this->data as $row) {
-            $csvRow = [];
-            foreach ($this->columns as $column) {
-                $value = $row[$column] ?? '';
-                // Escape CSV values
-                $csvRow[] = '"'.str_replace('"', '""', $value).'"';
+        foreach ($this->columns as $column) {
+            if(!array_key_exists($column, $this->data)) {
+                $csvRow[] = "'*****'";
+                continue;
             }
-            $csv .= implode(',', $csvRow)."\n";
+
+            $value = $this->data[$column] ?? '';
+            // Escape CSV values
+            $csvRow[] = '"'.str_replace('"', '""', $value).'"';
         }
+        $csv .= implode(',', $csvRow)."\n";
 
         return $csv;
     }

src/Builder/ExtractBuilder.php

@@ -2,6 +2,7 @@
 
 namespace NaimSolong\DataExtractor\Builder;
 
+use Illuminate\Database\DatabaseManager;
 use InvalidArgumentException;
 use RuntimeException;
 
@@ -78,9 +79,16 @@ public function build(): string
             throw new RuntimeException('Model not set. Use setModel() to set the model before building.');
         }
 
+        $table = $this->model->getTable();
+        
+        $columns = app(DatabaseManager::class)
+            ->connection($this->model->getConnectionName())
+            ->getSchemaBuilder()
+            ->getColumnListing($table);
+        
         $this->builder
-            ->setSchemaName($this->model->getTable())
-            ->setColumns(array_keys($this->model->getAttributes()))
+            ->setSchemaName($table)
+            ->setColumns($columns)
             ->setData($this->model->toArray());
 
         return $this->builder->build();

src/Builder/SqlBuilder.php

@@ -11,7 +11,14 @@ public function build(): string
     {
         $sql = '';
 
+        $values = [];
+
         foreach ($this->columns as $column) {
+            if(!array_key_exists($column, $this->data)) {
+                $values[] = "'*****'";
+                continue;
+            }
+
             $value = $this->data[$column];
 
             if (is_array($value)) {