Skip to content

Commit

Permalink
Fix spacing in basic indexes and enum lists
Browse files Browse the repository at this point in the history
  • Loading branch information
@elpete
elpete committed Sep 23, 2017
1 parent b7b6636 commit 4c2cf71
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions models/Grammars/BaseGrammar.cfc
View file
Expand Up @@ -920,7 +920,7 @@ component displayname="Grammar" accessors="true" {
function typeEnum( column ) {
var values = column.getValues().map( function ( value ) {
return wrapValue( value );
} ).toList( "," );
} ).toList( ", " );
return "ENUM(#values#)";
}

Expand Down Expand Up @@ -993,7 +993,7 @@ component displayname="Grammar" accessors="true" {
function indexBasic( index ) {
var columnsString = index.getColumns().map( function( column ) {
return wrapValue( column );
} ).toList( "," );
} ).toList( ", " );
return "INDEX #wrapValue( index.getName() )# (#columnsString#)";
}

Expand Down
2 changes: 1 addition & 1 deletion models/Schema/Blueprint.cfc
View file
Expand Up @@ -153,7 +153,7 @@ component accessors="true" {

function primaryKey( columns, name ) {
arguments.columns = isArray( columns ) ? columns : [ columns ];
arguments.name = isNull( name ) ? "pk_#arrayToList( columns, "_" )#" : arguments.name;
arguments.name = isNull( name ) ? "pk_#getTable()#_#arrayToList( columns, "_" )#" : arguments.name;
addIndex( type = "primary", columns = columns, name = name );
return this;
}
Expand Down
18 changes: 9 additions & 9 deletions tests/specs/Schema/SchemaBuilder+GrammarSpec.cfc
View file
Expand Up @@ -205,7 +205,7 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 1 );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""employees"" (""tshirt_size"" ENUM(""S"",""M"",""L"",""XL"",""XXL"") NOT NULL)" );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""employees"" (""tshirt_size"" ENUM(""S"", ""M"", ""L"", ""XL"", ""XXL"") NOT NULL)" );
} );

it( "float (with defaults)", function() {
Expand Down Expand Up @@ -348,7 +348,7 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 1 );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""tags"" (""taggable_id"" INTEGER(10) UNSIGNED NOT NULL, ""taggable_type"" VARCHAR(255) NOT NULL, INDEX ""taggable_index"" (""taggable_id"",""taggable_type""))" );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""tags"" (""taggable_id"" INTEGER(10) UNSIGNED NOT NULL, ""taggable_type"" VARCHAR(255) NOT NULL, INDEX ""taggable_index"" (""taggable_id"", ""taggable_type""))" );
} );

it( "nullableMorphs", function() {
Expand All @@ -359,7 +359,7 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 1 );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""tags"" (""taggable_id"" INTEGER(10) UNSIGNED, ""taggable_type"" VARCHAR(255), INDEX ""taggable_index"" (""taggable_id"",""taggable_type""))" );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""tags"" (""taggable_id"" INTEGER(10) UNSIGNED, ""taggable_type"" VARCHAR(255), INDEX ""taggable_index"" (""taggable_id"", ""taggable_type""))" );
} );

it( "raw", function() {
Expand Down Expand Up @@ -707,7 +707,7 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 1 );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""users"" (""first_name"" VARCHAR(255) NOT NULL, ""last_name"" VARCHAR(255) NOT NULL, INDEX ""idx_users_first_name_last_name"" (""first_name"",""last_name""))" );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""users"" (""first_name"" VARCHAR(255) NOT NULL, ""last_name"" VARCHAR(255) NOT NULL, INDEX ""idx_users_first_name_last_name"" (""first_name"", ""last_name""))" );
} );

it( "override index name", function() {
Expand All @@ -720,12 +720,12 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 1 );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""users"" (""first_name"" VARCHAR(255) NOT NULL, ""last_name"" VARCHAR(255) NOT NULL, INDEX ""index_full_name"" (""first_name"",""last_name""))" );
expect( statements[ 1 ] ).toBeWithCase( "CREATE TABLE ""users"" (""first_name"" VARCHAR(255) NOT NULL, ""last_name"" VARCHAR(255) NOT NULL, INDEX ""index_full_name"" (""first_name"", ""last_name""))" );
} );
} );

xdescribe( "primary indexes", function() {
it( "column primary key", function() {
xit( "column primary key", function() {
var schema = getBuilder();
var blueprint = schema.create( "users", function( table ) {
table.string( "uuid" ).primaryKey();
Expand Down Expand Up @@ -848,7 +848,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 ""tshirt_size"" ENUM(""S"",""M"",""L"",""XL"",""XXL"") NOT NULL" );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD ""tshirt_size"" ENUM(""S"", ""M"", ""L"", ""XL"", ""XXL"") NOT NULL" );
} );

it( "can add multiple columns", function() {
Expand All @@ -860,7 +860,7 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 2 );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD ""tshirt_size"" ENUM(""S"",""M"",""L"",""XL"",""XXL"") NOT NULL" );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD ""tshirt_size"" ENUM(""S"", ""M"", ""L"", ""XL"", ""XXL"") NOT NULL" );
expect( statements[ 2 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD ""is_active"" TINYINT(1) NOT NULL" );
} );
} );
Expand All @@ -877,7 +877,7 @@ component extends="testbox.system.BaseSpec" {
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 4 );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE ""users"" DROP COLUMN ""is_active""" );
expect( statements[ 2 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD ""tshirt_size"" ENUM(""S"",""M"",""L"",""XL"",""XXL"") NOT NULL" );
expect( statements[ 2 ] ).toBeWithCase( "ALTER TABLE ""users"" ADD ""tshirt_size"" ENUM(""S"", ""M"", ""L"", ""XL"", ""XXL"") NOT NULL" );
expect( statements[ 3 ] ).toBeWithCase( "ALTER TABLE ""users"" CHANGE ""name"" ""username"" VARCHAR(255) NOT NULL" );
expect( statements[ 4 ] ).toBeWithCase( "ALTER TABLE ""users"" CHANGE ""purchase_date"" ""purchase_date"" TIMESTAMP" );
} );
Expand Down
6 changes: 3 additions & 3 deletions tests/specs/Schema/SchemaBuilder+MySQLGrammarSpec.cfc
View file
Expand Up @@ -70,7 +70,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 `tshirt_size` ENUM(`S`,`M`,`L`,`XL`,`XXL`) NOT NULL" );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL" );
} );

it( "can add multiple columns", function() {
Expand All @@ -82,7 +82,7 @@ component extends="testbox.system.BaseSpec" {
var statements = blueprint.toSql();
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 2 );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`,`M`,`L`,`XL`,`XXL`) NOT NULL" );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL" );
expect( statements[ 2 ] ).toBeWithCase( "ALTER TABLE `users` ADD `is_active` TINYINT(1) NOT NULL" );
} );
} );
Expand Down Expand Up @@ -139,7 +139,7 @@ component extends="testbox.system.BaseSpec" {
expect( statements ).toBeArray();
expect( statements ).toHaveLength( 4 );
expect( statements[ 1 ] ).toBeWithCase( "ALTER TABLE `users` DROP COLUMN `is_active`" );
expect( statements[ 2 ] ).toBeWithCase( "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`,`M`,`L`,`XL`,`XXL`) NOT NULL" );
expect( statements[ 2 ] ).toBeWithCase( "ALTER TABLE `users` ADD `tshirt_size` ENUM(`S`, `M`, `L`, `XL`, `XXL`) NOT NULL" );
expect( statements[ 3 ] ).toBeWithCase( "ALTER TABLE `users` CHANGE `name` `username` VARCHAR(255) NOT NULL" );
expect( statements[ 4 ] ).toBeWithCase( "ALTER TABLE `users` CHANGE `purchase_date` `purchase_date` TIMESTAMP" );
} );
Expand Down

0 comments on commit 4c2cf71

Please sign in to comment.