fix(SchemaBuilder): Wrap enum values in single quotes

coldbox-modules · Nov 28, 2018 · 89b58c4 · 89b58c4
1 parent 7273ce4
commit 89b58c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/models/Grammars/BaseGrammar.cfc b/models/Grammars/BaseGrammar.cfc
@@ -1137,7 +1137,7 @@ component displayname="Grammar" accessors="true" {
 
     function typeEnum( column ) {
         var values = column.getValues().map( function ( value ) {
-            return wrapValue( value );
+            return "'#value#'";
         } ).toList( ", " );
         return "ENUM(#values#)";
     }

diff --git a/tests/specs/Schema/MySQLSchemaBuilderSpec.cfc b/tests/specs/Schema/MySQLSchemaBuilderSpec.cfc
@@ -70,7 +70,7 @@ component extends="tests.resources.AbstractSchemaBuilderSpec" {
 
     function enum() {
         return [
-            "CREATE TABLE `employees` (`tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL)"
+            "CREATE TABLE `employees` (`tshirt_size` ENUM('S', 'M', 'L', 'XL', 'XXL') NOT NULL)"
         ];
     }
 
@@ -371,21 +371,21 @@ component extends="tests.resources.AbstractSchemaBuilderSpec" {
 
     function addColumn() {
         return [
-            "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL"
+            "ALTER TABLE `users` ADD `tshirt_size` ENUM('S', 'M', 'L', 'XL', 'XXL') NOT NULL"
         ];
     }
 
     function addMultiple() {
         return [
-            "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL",
+            "ALTER TABLE `users` ADD `tshirt_size` ENUM('S', 'M', 'L', 'XL', 'XXL') NOT NULL",
             "ALTER TABLE `users` ADD `is_active` TINYINT(1) NOT NULL"
         ];
     }
 
     function complicatedModify() {
         return [
             "ALTER TABLE `users` DROP COLUMN `is_active`",
-            "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL",
+            "ALTER TABLE `users` ADD `tshirt_size` ENUM('S', 'M', 'L', 'XL', 'XXL') NOT NULL",
             "ALTER TABLE `users` CHANGE `name` `username` NVARCHAR(255) NOT NULL",
             "ALTER TABLE `users` CHANGE `purchase_date` `purchase_date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP",
             "ALTER TABLE `users` ADD CONSTRAINT `unq_users_username` UNIQUE (`username`)",