renameConstraint can take TableIndex instances as well as strings to …

…rename a constraint
coldbox-modules · Sep 30, 2017 · 4e9476d · 4e9476d
1 parent 3fd4c39
commit 4e9476d
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/models/Schema/Blueprint.cfc b/models/Schema/Blueprint.cfc
@@ -307,13 +307,13 @@ component accessors="true" {
         return this;
     }
 
-    function modifyColumn( name, newColumnDefinition ) {
-        addCommand( "modifyColumn", { from = name, to = newColumnDefinition } );
+    function modifyColumn( name, column ) {
+        addCommand( "modifyColumn", { from = name, to = column } );
         return this;
     }
 
-    function renameColumn( name, newColumnDefinition ) {
-        addCommand( "renameColumn", { from = name, to = newColumnDefinition } );
+    function renameColumn( name, column ) {
+        addCommand( "renameColumn", { from = name, to = column } );
         return this;
     }
 
@@ -333,7 +333,13 @@ component accessors="true" {
     }
 
     function renameConstraint( oldName, newName ) {
-        addCommand( "renameConstraint", { from = oldName, to = newName } );
+        if ( ! isSimpleValue( arguments.oldName ) ) {
+            arguments.oldName = dropConstraint( arguments.oldName.getName() );
+        }
+        if ( ! isSimpleValue( arguments.newName ) ) {
+            arguments.newName = dropConstraint( arguments.newName.getName() );
+        }
+        addCommand( "renameConstraint", { from = arguments.oldName, to = arguments.newName } );
         return this;
     }