Merge pull request #1625 from daniel-rose/bugfix/pgsql-add-unique-index

always create unique indices by constraint (for pgsql platform)

Author: dereuromark

src/Propel/Generator/Platform/PgsqlPlatform.php

@@ -688,8 +688,8 @@ public function getDropIndexDDL(Index $index)
     {
         if ($index instanceof Unique) {
             $pattern = "
-    ALTER TABLE %s DROP CONSTRAINT %s;
-    ";
+ALTER TABLE %s DROP CONSTRAINT %s;
+";
 
             return sprintf($pattern,
                 $this->quoteIdentifier($index->getTable()->getName()),
@@ -723,4 +723,26 @@ public function getIdentifierPhp($columnValueMutator, $connectionVariableName =
         return preg_replace('/^/m', $tab, $script);
     }
 
+    /**
+     * @param \Propel\Generator\Model\Index $index
+     *
+     * @return string
+     */
+    public function getAddIndexDDL(Index $index)
+    {
+        if (!$index->isUnique()) {
+            return parent::getAddIndexDDL($index);
+        }
+
+        $pattern = "
+ALTER TABLE %s ADD CONSTRAINT %s UNIQUE (%s);
+";
+
+        return sprintf(
+            $pattern,
+            $this->quoteIdentifier($index->getTable()->getName()),
+            $this->quoteIdentifier($index->getName()),
+            $this->getColumnListDDL($index->getColumnObjects())
+        );
+    }
 }

tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationMyISAMTest.php

@@ -175,8 +175,12 @@ public function testGetModifyTableIndicesDDL($tableDiff)
         $expected = "
 DROP INDEX `bar_fk` ON `foo`;
 
+DROP INDEX `bax_unique` ON `foo`;
+
 CREATE INDEX `baz_fk` ON `foo` (`baz`);
 
+CREATE UNIQUE INDEX `bax_bay_unique` ON `foo` (`bax`, `bay`);
+
 DROP INDEX `bar_baz_fk` ON `foo`;
 
 CREATE INDEX `bar_baz_fk` ON `foo` (`id`, `bar`, `baz`);

tests/Propel/Tests/Generator/Platform/MysqlPlatformMigrationTest.php

@@ -184,8 +184,12 @@ public function testGetModifyTableIndicesDDL($tableDiff)
         $expected = "
 DROP INDEX `bar_fk` ON `foo`;
 
+DROP INDEX `bax_unique` ON `foo`;
+
 CREATE INDEX `baz_fk` ON `foo` (`baz`);
 
+CREATE UNIQUE INDEX `bax_bay_unique` ON `foo` (`bax`, `bay`);
+
 DROP INDEX `bar_baz_fk` ON `foo`;
 
 CREATE INDEX `bar_baz_fk` ON `foo` (`id`, `bar`, `baz`);

tests/Propel/Tests/Generator/Platform/OraclePlatformMigrationTest.php

@@ -164,8 +164,12 @@ public function testGetModifyTableIndicesDDL($tableDiff)
         $expected = "
 DROP INDEX bar_fk;
 
+DROP INDEX bax_unique;
+
 CREATE INDEX baz_fk ON foo (baz);
 
+CREATE UNIQUE INDEX bax_bay_unique ON foo (bax,bay);
+
 DROP INDEX bar_baz_fk;
 
 CREATE INDEX bar_baz_fk ON foo (id,bar,baz);

tests/Propel/Tests/Generator/Platform/PgsqlPlatformMigrationTest.php

@@ -155,8 +155,12 @@ public function testGetModifyTableIndicesDDL($tableDiff)
 
 DROP INDEX "bar_fk";
 
+ALTER TABLE "foo" DROP CONSTRAINT "bax_unique";
+
 CREATE INDEX "baz_fk" ON "foo" ("baz");
 
+ALTER TABLE "foo" ADD CONSTRAINT "bax_bay_unique" UNIQUE ("bax","bay");
+
 DROP INDEX "bar_baz_fk";
 
 CREATE INDEX "bar_baz_fk" ON "foo" ("id","bar","baz");

tests/Propel/Tests/Generator/Platform/PgsqlPlatformTest.php

@@ -17,6 +17,7 @@
 use Propel\Generator\Model\IdMethodParameter;
 use Propel\Generator\Model\PropelTypes;
 use Propel\Generator\Model\Table;
+use Propel\Generator\Model\Unique;
 use Propel\Generator\Platform\PgsqlPlatform;
 
 /**
@@ -600,6 +601,21 @@ public function testAddIndexDDL($index)
         $this->assertEquals($expected, $this->getPlatform()->getAddIndexDDL($index));
     }
 
+    /**
+     * @dataProvider providerForTestGetUniqueIndexDDL
+     *
+     * @param \Propel\Generator\Model\Unique $index
+     *
+     * @return void
+     */
+    public function testAddUniqueIndexDDL(Unique $index): void
+    {
+        $expected = '
+ALTER TABLE "foo" ADD CONSTRAINT "babar" UNIQUE ("bar1");
+';
+        $this->assertEquals($expected, $this->getPlatform()->getAddIndexDDL($index));
+    }
+
     /**
      * @dataProvider providerForTestGetIndicesDDL
      */

tests/Propel/Tests/Generator/Platform/PlatformMigrationTestProvider.php

@@ -199,13 +199,17 @@ public function providerForTestGetModifyTableIndicesDDL()
         <column name="id" primaryKey="true" type="INTEGER" autoIncrement="true" />
         <column name="bar" type="INTEGER" />
         <column name="baz" type="VARCHAR" size="12" required="true" />
+        <column name="bax" type="VARCHAR" size="12" required="true" />
         <index name="bar_fk">
             <index-column name="bar"/>
         </index>
         <index name="bar_baz_fk">
             <index-column name="bar"/>
             <index-column name="baz"/>
         </index>
+        <unique name="bax_unique">
+            <unique-column name="bax"/>
+        </unique>
     </table>
 </database>
 EOF;
@@ -215,6 +219,8 @@ public function providerForTestGetModifyTableIndicesDDL()
         <column name="id" primaryKey="true" type="INTEGER" autoIncrement="true" />
         <column name="bar" type="INTEGER" />
         <column name="baz" type="VARCHAR" size="12" required="true" />
+        <column name="bay" type="VARCHAR" size="12" required="true" />
+        <column name="bax" type="VARCHAR" size="12" required="true" />
         <index name="bar_baz_fk">
             <index-column name="id"/>
             <index-column name="bar"/>
@@ -223,6 +229,10 @@ public function providerForTestGetModifyTableIndicesDDL()
         <index name="baz_fk">
             <index-column name="baz"/>
         </index>
+        <unique name="bax_bay_unique">
+            <unique-column name="bax"/>
+            <unique-column name="bay"/>
+        </unique>
     </table>
 </database>
 EOF;

tests/Propel/Tests/Generator/Platform/PlatformTestProvider.php

@@ -247,6 +247,25 @@ public function providerForTestGetIndexDDL()
         ];
     }
 
+    /**
+     * @return array
+     */
+    public function providerForTestGetUniqueIndexDDL(): array
+    {
+        $table = new Table('foo');
+        $table->setIdentifierQuoting(true);
+        $column1 = new Column('bar1');
+        $column1->getDomain()->copy(new Domain('FOOTYPE'));
+        $table->addColumn($column1);
+        $index = new Unique('babar');
+        $index->addColumn($column1);
+        $table->addIndex($index);
+
+        return [
+            [$index]
+        ];
+    }
+
     public function providerForTestPrimaryKeyDDL()
     {
         $table = new Table('foo');