Fixes

fulldecent · Oct 29, 2019 · 0c8e2bf · 0c8e2bf
1 parent 122b79d
commit 0c8e2bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/bin/google-sheets-etl b/bin/google-sheets-etl
@@ -32,6 +32,7 @@ $database = new \PDO($databaseDsn, $databaseUsername, $databasePassword, [
 
 $tasks = new Tasks($googleServiceAccountCredentialFile, $database);
 $tasks->setConfiguration($etlSchemaFile);
+$tasks->databaseAgent->setUpAccounting();
 
 echo 'Service account: ' . $tasks->googleSheetsAgent->getAccountName() . PHP_EOL;
 

diff --git a/src/DatabaseAgent.php b/src/DatabaseAgent.php
@@ -78,7 +78,6 @@ protected function __construct(\PDO $newDatabase)
     {
         $this->database = $newDatabase;
         $this->loadTime = date('Y-m-d H:i:s');
-        $this->setUpAccounting();
     }
 
     // Getters /////////////////////////////////////////////////////////////////

diff --git a/src/DatabaseAgentMysql.php b/src/DatabaseAgentMysql.php
@@ -38,6 +38,7 @@ public function setUpAccounting()
 	`last_modified` VARCHAR(99) NOT NULL,
 	`last_authorization_checked` VARCHAR(20) NOT NULL,
 	`last_loaded` VARCHAR(99),
+	UNIQUE KEY `row_id` (`_rowid_`),
 	UNIQUE KEY `spreadsheet_id` (`spreadsheet_id`)
 ) ENGINE=InnoDB;        
 SQL;
@@ -50,6 +51,7 @@ public function setUpAccounting()
 	`sheet_name` VARCHAR(99) NOT NULL,
 	`last_loaded` VARCHAR(99),
 	`table_name` VARCHAR(99),
+	UNIQUE KEY `row_id` (`_rowid_`),
 	UNIQUE KEY `sheet_name` (`spreadsheet_rowid`, `sheet_name`)
 ) ENGINE InnoDB;
 SQL;
@@ -141,6 +143,7 @@ public function getTableNameForSheet(string $spreadsheetId, string $sheetName):
     public function getGreatestModifiedAndIdLoaded(): ?array
     {
         $quotedSpreadsheetsTable = $this->quotedFullyQualifiedTableName(self::SPREADSHEETS_TABLE);
+        var_dump($quotedSpreadsheetsTable);
         $sql = <<<A
 SELECT last_modified, spreadsheet_id
   FROM $quotedSpreadsheetsTable
@@ -220,8 +223,8 @@ public function loadAndAccountSheet(string $spreadsheetId, string $sheetName, st
         $dropTableSql = "DROP TABLE IF EXISTS $quotedTableName";
         $this->database->exec($dropTableSql);
         $quotedColumnArray = $this->normalizedQuotedColumnNames($columns);
-        $quotedColumns = implode(',', $quotedColumnArray);
-        $createTableSql = "CREATE TABLE $quotedTableName ($quotedColumns)";
+        $quotedColumns = implode(' VARCHAR(100),', $quotedColumnArray);
+        $createTableSql = "CREATE TABLE $quotedTableName ($quotedColumns VARCHAR(100))";
         $this->database->exec($createTableSql);
 
         // Insert rows
@@ -292,7 +295,7 @@ public function removeOutdatedSheets(string $spreadsheetId)
   FROM $quotedSheetsTable
  WHERE _rowid_ IN (
        SELECT sheets._rowid_
-         FROM $quotedSheetsTable sheets
+         FROM (SELECT * FROM $quotedSheetsTable) sheets
          JOIN $quotedSpreadsheetsTable spreadsheets
            ON spreadsheets._rowid_ = sheets.spreadsheet_rowid
         WHERE spreadsheet_id = ?
@@ -343,7 +346,7 @@ public function removeSpreadsheet(string $spreadsheetId)
   FROM $quotedSheetsTable
  WHERE spreadsheet_rowid IN (
        SELECT _rowid_
-         FROM $quotedSpreadsheetsTable
+         FROM (SELECT * FROM $quotedSpreadsheetsTable)
         WHERE spreadsheet_id = ?
        )
 AAAA;
@@ -379,7 +382,9 @@ public function removeSpreadsheet(string $spreadsheetId)
     private function quotedFullyQualifiedTableName(string $unqualifiedName): string
     {
         $qualifiedTableName = ($this->tablePrefix ?? '') . $unqualifiedName;
-        return ($this->schema ?? '') . "`$qualifiedTableName`";
+        return isset($this->schema)
+            ? $this->schema . ".`$qualifiedTableName`"
+            : "`$qualifiedTableName`";
     }
 
     /**

diff --git a/src/Tasks.php b/src/Tasks.php
@@ -43,8 +43,8 @@ public function setConfiguration(string $configurationFileName)
                 $this->configurationForSpreadsheetSheet[$spreadsheetId][$sheetName] = (object)[
                     'tableName' => $configuration->tableName, # Required property
                     'columnMapping' => (array)($configuration->columnMapping), # Optional
-                    'headerRow' => $configuration->headerRow ?? null, # Optional
-                    'skipRows' => $configuration->skipRows ?? null # Optional
+                    'headerRow' => $configuration->headerRow ?? 0, # Optional
+                    'skipRows' => $configuration->skipRows ?? 1 # Optional
                 ];
             }
         }