Adding check on autoincremented primary key

Author: moufmouf

src/SchemaAnalyzer.php

@@ -81,9 +81,16 @@ private function isJunctionTable(Table $table) {
             $fkColumnNames[$fkColumns[0]] = true;
         }
 
-        // Let's check that the third column (the ID is NOT a foreign key)
-        if (count($columns) == 3 && isset($fkColumnNames[$pkColumns[0]])) {
-            return false;
+        if (count($columns) == 3) {
+            // Let's check that the third column (the ID is NOT a foreign key)
+            if (isset($fkColumnNames[$pkColumns[0]])) {
+                return false;
+            }
+
+            // Let's check that the primary key is autoincremented
+            if (!$table->getColumn($pkColumns[0])->getAutoincrement()) {
+                return false;
+            }
         }
 
         return true;

tests/SchemaAnalyzerTest.php

@@ -64,7 +64,7 @@ public function testJointureTableDetectionWith3Columns() {
         $schema = $this->getBaseSchema();
 
         $role_right = $schema->createTable("role_right");
-        $role_right->addColumn("id", "integer", array("unsigned" => true));
+        $role_right->addColumn("id", "integer", array("unsigned" => true, "autoincrement" => true));
         $role_right->addColumn("role_id", "integer", array("unsigned" => true));
         $role_right->addColumn("right_id", "integer", array("unsigned" => true));
 
@@ -82,11 +82,29 @@ public function testJointureTableDetectionWith3Columns() {
         }
     }
 
+    public function testJointureTableDetectionWith3ColumnsNoAutoincrement() {
+        $schema = $this->getBaseSchema();
+
+        $role_right = $schema->createTable("role_right");
+        $role_right->addColumn("id", "integer", array("unsigned" => true, "autoincrement" => false));
+        $role_right->addColumn("role_id", "integer", array("unsigned" => true));
+        $role_right->addColumn("right_id", "integer", array("unsigned" => true));
+
+        $role_right->addForeignKeyConstraint($schema->getTable('role'), array("role_id"), array("id"), array("onUpdate" => "CASCADE"));
+        $role_right->addForeignKeyConstraint($schema->getTable('right'), array("right_id"), array("id"), array("onUpdate" => "CASCADE"));
+        $role_right->setPrimaryKey(["id"]);
+
+        $schemaAnalyzer = new SchemaAnalyzer($schema);
+        $junctionTables = $schemaAnalyzer->detectJunctionTables();
+
+        $this->assertCount(0, $junctionTables);
+    }
+
     public function testJointureTableDetectionWith4Columns() {
         $schema = $this->getBaseSchema();
 
         $role_right = $schema->createTable("role_right");
-        $role_right->addColumn("id", "integer", array("unsigned" => true));
+        $role_right->addColumn("id", "integer", array("unsigned" => true, "autoincrement" => true));
         $role_right->addColumn("role_id", "integer", array("unsigned" => true));
         $role_right->addColumn("right_id", "integer", array("unsigned" => true));
         $role_right->addColumn("label", "string", array("length" => 32));
@@ -140,7 +158,7 @@ public function testJointureTableDetectionWith3ColumnsWithPkIsFk() {
         $schema = $this->getBaseSchema();
 
         $role_right = $schema->createTable("role_right");
-        $role_right->addColumn("id", "integer", array("unsigned" => true));
+        $role_right->addColumn("id", "integer", array("unsigned" => true, "autoincrement" => true));
         $role_right->addColumn("role_id", "integer", array("unsigned" => true));
         $role_right->addColumn("right_id", "integer", array("unsigned" => true));