AUD-80: New columns in data table not shown by diff command. Add unit…

src/MySql/AuditDiff.php

@@ -293,7 +293,7 @@ private function resolveCanonicalAuditColumns()
   {
     if (empty($this->config['audit_columns']))
     {
-      $this->auditColumnsMetadata = new TableColumnsMetadata();
+      $this->auditColumnsMetadata = [];
     }
     else
     {

test/MySql/AbcFramework/AbcFrameworkTest.php → test/MySql/AuditCommand/AbcFramework/AbcFrameworkTest.php

@@ -1,6 +1,6 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-namespace SetBased\Audit\Test\MySql\AbcFramework;
+namespace SetBased\Audit\Test\MySql\AbcFramework\AuditCommand;
 
 use SetBased\Audit\MySql\Command\AuditCommand;
 use SetBased\Audit\Test\MySql\AuditTestCase;

test/MySql/LockTable/LockTableInnodbTest.php → test/MySql/AuditCommand/LockTable/LockTableInnodbTest.php

@@ -1,6 +1,6 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-namespace SetBased\Audit\Test\MySql\LockTable;
+namespace SetBased\Audit\Test\MySql\AuditCommand\LockTable;
 
 use SetBased\Stratum\MySql\StaticDataLayer;
 

test/MySql/LockTable/LockTableMemoryTest.php → test/MySql/AuditCommand/LockTable/LockTableMemoryTest.php

@@ -1,6 +1,6 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-namespace SetBased\Audit\Test\MySql\LockTable;
+namespace SetBased\Audit\Test\MySql\AuditCommand\LockTable;
 
 use SetBased\Stratum\MySql\StaticDataLayer;
 

test/MySql/LockTable/LockTableMyisamTest.php → test/MySql/AuditCommand/LockTable/LockTableMyisamTest.php

@@ -1,6 +1,6 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-namespace SetBased\Audit\Test\MySql\LockTable;
+namespace SetBased\Audit\Test\MySql\AuditCommand\LockTable;
 
 use SetBased\Stratum\MySql\StaticDataLayer;
 

test/MySql/LockTable/LockTableTestCase.php → test/MySql/AuditCommand/LockTable/LockTableTestCase.php

@@ -1,6 +1,6 @@
 <?php
 //----------------------------------------------------------------------------------------------------------------------
-namespace SetBased\Audit\Test\MySql\LockTable;
+namespace SetBased\Audit\Test\MySql\AuditCommand\LockTable;
 
 use SetBased\Audit\MySql\Command\AuditCommand;
 use SetBased\Audit\Test\MySql\AuditTestCase;

test/MySql/LockTable/config/generator.php → test/MySql/AuditCommand/LockTable/config/generator.php

@@ -1,14 +1,16 @@
 #!/usr/bin/env php
 <?php
 //----------------------------------------------------------------------------------------------------------------------
+
 use SetBased\Affirm\ErrorHandler;
 use SetBased\Stratum\MySql\StaticDataLayer;
 
 //----------------------------------------------------------------------------------------------------------------------
 $files = [__DIR__.'/../vendor/autoload.php',
           __DIR__.'/../../vendor/autoload.php',
           __DIR__.'/../../../vendor/autoload.php',
-          __DIR__.'/../../../../vendor/autoload.php'];
+          __DIR__.'/../../../../vendor/autoload.php',
+          __DIR__.'/../../../../../vendor/autoload.php'];
 
 foreach ($files as $file)
 {

test/MySql/DiffCommand/CharacterSetName/CharacterSetNameTest.php

@@ -0,0 +1,90 @@
+<?php
+//----------------------------------------------------------------------------------------------------------------------
+namespace SetBased\Audit\Test\MySql\DiffCommand\CharacterSetName;
+
+use SetBased\Audit\MySql\AuditDataLayer;
+use SetBased\Audit\MySql\Command\AuditCommand;
+use SetBased\Audit\MySql\Command\DiffCommand;
+use SetBased\Audit\Test\MySql\AuditTestCase;
+use SetBased\Stratum\MySql\StaticDataLayer;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+
+//----------------------------------------------------------------------------------------------------------------------
+/**
+ * Tests for running diff with a new table column in data table.
+ */
+class DiffCharacterSetNameTest extends AuditTestCase
+{
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * {@inheritdoc}
+   */
+  public static function setUpBeforeClass()
+  {
+    parent::setUpBeforeClass();
+
+    StaticDataLayer::disconnect();
+    StaticDataLayer::connect('localhost', 'test', 'test', self::$dataSchema);
+
+    StaticDataLayer::multiQuery(file_get_contents(__DIR__.'/config/setup.sql'));
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  public function test01()
+  {
+    // Run audit.
+    $this->runAudit();
+
+    // Create new column.
+    StaticDataLayer::multiQuery(file_get_contents(__DIR__.'/config/change_charset.sql'));
+
+    $this->runDiff();    
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  private function runDiff()
+  {
+    $application = new Application();
+    $application->add(new DiffCommand());
+
+    /** @var DiffCommand $command */
+    $command = $application->find('diff');
+    $command->setRewriteConfigFile(false);
+    $commandTester = new CommandTester($command);
+    $commandTester->execute(['command'     => $command->getName(),
+                             'config file' => __DIR__.'/config/audit.json']);
+
+    $output = $commandTester->getDisplay();
+    $this->assertContains('| c4     | varchar(20)              | varchar(20)                | int(11) |', $output, 'acquire');
+    $this->assertContains('|        | [utf8] [utf8_general_ci] | [ascii] [ascii_general_ci] |         |', $output, 'acquire');
+
+    // Reconnect to MySQL.
+    StaticDataLayer::disconnect();
+    StaticDataLayer::connect('localhost', 'test', 'test', self::$dataSchema);
+    AuditDataLayer::connect('localhost', 'test', 'test', self::$dataSchema);
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  private function runAudit()
+  {
+    $application = new Application();
+    $application->add(new AuditCommand());
+
+    /** @var AuditCommand $command */
+    $command = $application->find('audit');
+    $command->setRewriteConfigFile(true);
+    $commandTester = new CommandTester($command);
+    $commandTester->execute(['command'     => $command->getName(),
+                             'config file' => __DIR__.'/config/audit.json']);
+
+    // Reconnect to MySQL.
+    StaticDataLayer::disconnect();
+    StaticDataLayer::connect('localhost', 'test', 'test', self::$auditSchema);
+    AuditDataLayer::connect('localhost', 'test', 'test', self::$auditSchema);
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+}
+
+//----------------------------------------------------------------------------------------------------------------------

test/MySql/DiffCommand/CharacterSetName/config/audit.json

@@ -0,0 +1,23 @@
+{
+    "database": {
+        "host": "localhost",
+        "user": "test",
+        "password": "test",
+        "data_schema": "test_data",
+        "audit_schema": "test_audit"
+    },
+    "metadata": "audit_metadata.json",
+    "tables": {
+        "TABLE1": {
+            "audit": true,
+            "skip": null,
+            "alias": "t1"
+        }
+    },
+    "audit_columns": [
+
+    ],
+    "additional_sql": [
+
+    ]
+}

test/MySql/DiffCommand/CharacterSetName/config/audit_metadata.json

@@ -0,0 +1,19 @@
+{
+    "TABLE1": [
+        {
+            "column_name": "c1",
+            "column_type": "tinyint(4)",
+            "is_nullable": "YES"
+        },
+        {
+            "column_name": "c2",
+            "column_type": "smallint(6)",
+            "is_nullable": "YES"
+        },
+        {
+            "column_name": "c4",
+            "column_type": "int(11)",
+            "is_nullable": "YES"
+        }
+    ]
+}

test/MySql/DiffCommand/CharacterSetName/config/change_charset.sql

@@ -0,0 +1 @@
+ALTER TABLE `TABLE1` MODIFY c4 VARCHAR(20) CHARACTER SET ascii;

test/MySql/DiffCommand/CharacterSetName/config/setup.sql

@@ -0,0 +1,6 @@
+CREATE TABLE `TABLE1` (
+  c1 tinyint,
+  c2 smallint,
+  c4 varchar(20)
+);
+

test/MySql/DiffCommand/DiffTypeConfigAudit/DiffTypeConfigAuditTest.php

@@ -0,0 +1,90 @@
+<?php
+//----------------------------------------------------------------------------------------------------------------------
+namespace SetBased\Audit\Test\MySql\DiffCommand\DiffTypeConfigAudit;
+
+use SetBased\Audit\MySql\AuditDataLayer;
+use SetBased\Audit\MySql\Command\AuditCommand;
+use SetBased\Audit\MySql\Command\DiffCommand;
+use SetBased\Audit\Test\MySql\AuditTestCase;
+use SetBased\Stratum\MySql\StaticDataLayer;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+
+//----------------------------------------------------------------------------------------------------------------------
+/**
+ * Tests for running diff with a new table column in audit table.
+ */
+class DiffTypeConfigAuditTest extends AuditTestCase
+{
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * {@inheritdoc}
+   */
+  public static function setUpBeforeClass()
+  {
+    parent::setUpBeforeClass();
+
+    StaticDataLayer::disconnect();
+    StaticDataLayer::connect('localhost', 'test', 'test', self::$dataSchema);
+
+    StaticDataLayer::multiQuery(file_get_contents(__DIR__.'/config/setup.sql'));
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  public function test01()
+  {
+    // Run audit.
+    $this->runAudit();
+
+    // Create new column.
+    StaticDataLayer::multiQuery(file_get_contents(__DIR__.'/config/change_column_type.sql'));
+
+    $this->runDiff();    
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  private function runDiff()
+  {
+    $application = new Application();
+    $application->add(new DiffCommand());
+
+    /** @var DiffCommand $command */
+    $command = $application->find('diff');
+    $command->setRewriteConfigFile(false);
+    $commandTester = new CommandTester($command);
+    $commandTester->execute(['command'     => $command->getName(),
+                             'config file' => __DIR__.'/config/audit.json']);
+
+    $output = $commandTester->getDisplay();
+    $this->assertContains('| c4     | int(11)    | varchar(20)              | int(11) |', $output, 'acquire');
+    $this->assertContains('|        |            | [utf8] [utf8_general_ci] |         |', $output, 'acquire');
+
+    // Reconnect to MySQL.
+    StaticDataLayer::disconnect();
+    StaticDataLayer::connect('localhost', 'test', 'test', self::$dataSchema);
+    AuditDataLayer::connect('localhost', 'test', 'test', self::$dataSchema);
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  private function runAudit()
+  {
+    $application = new Application();
+    $application->add(new AuditCommand());
+
+    /** @var AuditCommand $command */
+    $command = $application->find('audit');
+    $command->setRewriteConfigFile(false);
+    $commandTester = new CommandTester($command);
+    $commandTester->execute(['command'     => $command->getName(),
+                             'config file' => __DIR__.'/config/audit.json']);
+
+    // Reconnect to MySQL.
+    StaticDataLayer::disconnect();
+    StaticDataLayer::connect('localhost', 'test', 'test', self::$auditSchema);
+    AuditDataLayer::connect('localhost', 'test', 'test', self::$auditSchema);
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+}
+
+//----------------------------------------------------------------------------------------------------------------------

test/MySql/DiffCommand/DiffTypeConfigAudit/config/audit.json

@@ -0,0 +1,23 @@
+{
+    "database": {
+        "host": "localhost",
+        "user": "test",
+        "password": "test",
+        "data_schema": "test_data",
+        "audit_schema": "test_audit"
+    },
+    "metadata": "audit_metadata.json",
+    "tables": {
+        "TABLE1": {
+            "audit": true,
+            "skip": null,
+            "alias": "t1"
+        }
+    },
+    "audit_columns": [
+
+    ],
+    "additional_sql": [
+
+    ]
+}

test/MySql/DiffCommand/DiffTypeConfigAudit/config/audit_metadata.json

@@ -0,0 +1,19 @@
+{
+    "TABLE1": [
+        {
+            "column_name": "c1",
+            "column_type": "tinyint(4)",
+            "is_nullable": "YES"
+        },
+        {
+            "column_name": "c2",
+            "column_type": "smallint(6)",
+            "is_nullable": "YES"
+        },
+        {
+            "column_name": "c4",
+            "column_type": "int(11)",
+            "is_nullable": "YES"
+        }
+    ]
+}

test/MySql/DiffCommand/DiffTypeConfigAudit/config/change_column_type.sql

@@ -0,0 +1 @@
+ALTER TABLE `TABLE1` MODIFY c4 VARCHAR(20) CHARACTER SET utf8;

test/MySql/DiffCommand/DiffTypeConfigAudit/config/setup.sql

@@ -0,0 +1,6 @@
+CREATE TABLE `TABLE1` (
+  c1 tinyint,
+  c2 smallint,
+  c4 int
+);
+