From 89b58c4f251bf6322439c7fb5b992684fdc9882a Mon Sep 17 00:00:00 2001 From: Eric Peterson Date: Tue, 27 Nov 2018 21:16:15 -0700 Subject: [PATCH] fix(SchemaBuilder): Wrap enum values in single quotes --- models/Grammars/BaseGrammar.cfc | 2 +- tests/specs/Schema/MySQLSchemaBuilderSpec.cfc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/Grammars/BaseGrammar.cfc b/models/Grammars/BaseGrammar.cfc index 5c4d8f3a..60deab7b 100644 --- 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 index be83f1b3..92586403 100644 --- 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,13 +371,13 @@ 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" ]; } @@ -385,7 +385,7 @@ component extends="tests.resources.AbstractSchemaBuilderSpec" { 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`)",