Remove constraints by name or index object

coldbox-modules · Sep 23, 2017 · dffee36 · dffee36
1 parent 61306e0
commit dffee36
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/models/Grammars/BaseGrammar.cfc b/models/Grammars/BaseGrammar.cfc
@@ -867,9 +867,16 @@ component displayname="Grammar" accessors="true" {
     ===================================*/
 
     function compileAddConstraint( blueprint, commandParameters ) {
-        if ( blueprint.getCreating() ) {
-            return "";
-        }
+        var constraints = blueprint.getIndexes().map( function( index ) {
+            return invoke( this, "index#index.getType()#", { index = index } );
+        } ).filter( function( item ) {
+            return item != "";
+        } ).toList( ", " );
+        return "ALTER TABLE #wrapTable( blueprint.getTable() )# ADD #constraints#";
+    }
+
+    function compileRemoveConstraint( blueprint, commandParameters ) {
+        return "ALTER TABLE #wrapTable( blueprint.getTable() )# DROP INDEX #wrapValue( commandParameters.name )#";
     }
 
     /*=====  End of Constraints  ======*/

diff --git a/models/Schema/Blueprint.cfc b/models/Schema/Blueprint.cfc
@@ -65,6 +65,23 @@ component accessors="true" {
         return newColumn;
     }
 
+    function addConstraint( constraint ) {
+        addCommand( "addConstraint" );
+        return this;
+    }
+
+    function removeConstraint( name ) {
+        if ( ! isSimpleValue( name ) ) {
+            name.getIndexes().each( function( index ) {
+                removeConstraint( index.getName() );
+            } );
+        }
+        else {
+            addCommand( "removeConstraint", { name = name } );
+        }
+        return this;
+    }
+
     function addIndex() {
         var newIndex = new TableIndex( this );
         var indexMetadata = getMetadata( newIndex );

diff --git a/tests/specs/Schema/SchemaBuilder+GrammarSpec.cfc b/tests/specs/Schema/SchemaBuilder+GrammarSpec.cfc
@@ -648,7 +648,7 @@ component extends="testbox.system.BaseSpec" {
                             } );
                         } );
 
-                        xdescribe( "in alter", function() {
+                        describe( "in alter", function() {
                             it( "add constraint", function() {
                                 var schema = getBuilder();
                                 var blueprint = schema.alter( "users", function( table ) {
@@ -657,7 +657,7 @@ component extends="testbox.system.BaseSpec" {
                                 var statements = blueprint.toSql();
                                 expect( statements ).toBeArray();
                                 expect( statements ).toHaveLength( 1 );
-                                expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD CONSTRAINT ""unique_username"" (""username"")" );
+                                expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD CONSTRAINT ""unique_username"" UNIQUE (""username"")" );
                             } );
 
                             it( "remove constraint", function() {