yujunjun/knex
1
0
Fork 0
mirror of https://github.com/knex/knex.git synced 2025-12-26 06:28:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

wrap index names

Browse Source
This commit is contained in:
Max Claus Nunes 2015-07-15 23:16:30 -03:00
parent 990cb8958b
commit 8d6264e96b
10 changed files with 123 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dialects/mssql/schema/tablecompiler.js
View File

@ -79,12 +79,12 @@ assign(TableCompiler_MSSQL.prototype, {
},
index: function (columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('CREATE INDEX ' + indexName + ' ON ' + this.tableName() + ' (' + this.formatter.columnize(columns) + ')');
},
primary: function (columns, indexName) {
indexName = indexName || this._indexCommand('primary', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('primary', this.tableNameRaw, columns);
if (!this.forCreate) {
this.pushQuery('ALTER TABLE ' + this.tableName() + ' ADD PRIMARY KEY (' + this.formatter.columnize(columns) + ')');
} else {
@ -93,7 +93,7 @@ assign(TableCompiler_MSSQL.prototype, {
},
unique: function (columns, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, columns);
if (!this.forCreate) {
this.pushQuery('CREATE UNIQUE INDEX ' + indexName + ' ON ' + this.tableName() + ' (' + this.formatter.columnize(columns) + ')');
} else {
@ -103,13 +103,13 @@ assign(TableCompiler_MSSQL.prototype, {
// Compile a drop index command.
dropIndex: function (columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('DROP INDEX ' + indexName + ' ON ' + this.tableName());
},
// Compile a drop foreign key command.
dropForeign: function (columns, indexName) {
indexName = indexName || this._indexCommand('foreign', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('foreign', this.tableNameRaw, columns);
this.pushQuery('ALTER TABLE ' + this.tableName() + ' DROP CONSTRAINT ' + indexName);
},
@ -120,7 +120,7 @@ assign(TableCompiler_MSSQL.prototype, {
// Compile a drop unique key command.
dropUnique: function (column, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, column);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, column);
this.pushQuery('ALTER TABLE ' + this.tableName() + ' DROP CONSTRAINT ' + indexName);
}

12
src/dialects/mysql/schema/tablecompiler.js
View File

@ -145,29 +145,29 @@ assign(TableCompiler_MySQL.prototype, {
}));
},
index: function(columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + " add index " + indexName + "(" + this.formatter.columnize(columns) + ")");
},
primary: function(columns, indexName) {
indexName = indexName || this._indexCommand('primary', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('primary', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + " add primary key " + indexName + "(" + this.formatter.columnize(columns) + ")");
},
unique: function(columns, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + " add unique " + indexName + "(" + this.formatter.columnize(columns) + ")");
},
// Compile a drop index command.
dropIndex: function(columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + ' drop index ' + indexName);
},
// Compile a drop foreign key command.
dropForeign: function(columns, indexName) {
indexName = indexName || this._indexCommand('foreign', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('foreign', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + ' drop foreign key ' + indexName);
},
@ -178,7 +178,7 @@ assign(TableCompiler_MySQL.prototype, {
// Compile a drop unique key command.
dropUnique: function(column, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, column);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, column);
this.pushQuery('alter table ' + this.tableName() + ' drop index ' + indexName);
}

10
src/dialects/postgres/schema/tablecompiler.js
View File

@ -52,12 +52,12 @@ TableCompiler_PG.prototype.primary = function(columns) {
this.pushQuery('alter table ' + this.tableName() + " add primary key (" + this.formatter.columnize(columns) + ")");
};
TableCompiler_PG.prototype.unique = function(columns, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + ' add constraint ' + indexName +
' unique (' + this.formatter.columnize(columns) + ')');
};
TableCompiler_PG.prototype.index = function(columns, indexName, indexType) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('create index ' + indexName + ' on ' + this.tableName() + (indexType && (' using ' + indexType) || '') +
' (' + this.formatter.columnize(columns) + ')');
};
@ -66,15 +66,15 @@ TableCompiler_PG.prototype.dropPrimary = function() {
this.pushQuery('alter table ' + this.tableName() + " drop constraint " + constraintName);
};
TableCompiler_PG.prototype.dropIndex = function(columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('drop index ' + indexName);
};
TableCompiler_PG.prototype.dropUnique = function(columns, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + ' drop constraint ' + indexName);
};
TableCompiler_PG.prototype.dropForeign = function(columns, indexName) {
indexName = indexName || this._indexCommand('foreign', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('foreign', this.tableNameRaw, columns);
this.pushQuery('alter table ' + this.tableName() + ' drop constraint ' + indexName);
};

8
src/dialects/sqlite3/schema/tablecompiler.js
View File

@ -39,25 +39,25 @@ TableCompiler_SQLite3.prototype.addColumns = function(columns) {
// Compile a drop unique key command.
TableCompiler_SQLite3.prototype.dropUnique = function(columns, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, columns);
this.pushQuery('drop index ' + indexName);
};
TableCompiler_SQLite3.prototype.dropIndex = function(columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
this.pushQuery('drop index ' + indexName);
};
// Compile a unique key command.
TableCompiler_SQLite3.prototype.unique = function(columns, indexName) {
indexName = indexName || this._indexCommand('unique', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('unique', this.tableNameRaw, columns);
columns = this.formatter.columnize(columns);
this.pushQuery('create unique index ' + indexName + ' on ' + this.tableName() + ' (' + columns + ')');
};
// Compile a plain index key command.
TableCompiler_SQLite3.prototype.index = function(columns, indexName) {
indexName = indexName || this._indexCommand('index', this.tableNameRaw, columns);
indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand('index', this.tableNameRaw, columns);
columns = this.formatter.columnize(columns);
this.pushQuery('create index ' + indexName + ' on ' + this.tableName() + ' (' + columns + ')');
};

5
src/schema/tablecompiler.js
View File

@ -201,7 +201,8 @@ TableCompiler.prototype.dropColumn = function () {
TableCompiler.prototype._indexCommand = function (type, tableName, columns) {
if (!isArray(columns)) columns = columns ? [columns] : [];
var table = tableName.replace(/\.|-/g, '_');
return (table + '_' + columns.join('_') + '_' + type).toLowerCase();
var indexName = (table + '_' + columns.join('_') + '_' + type).toLowerCase();
return this.formatter.wrap(indexName);
};
module.exports = TableCompiler;
module.exports = TableCompiler;

58
test/integration/schema/index.js
View File

@ -38,6 +38,7 @@ module.exports = function(knex) {
.dropTableIfExists('test_default_table3')
.dropTableIfExists('knex_migrations')
.dropTableIfExists('bool_test')
.dropTableIfExists('10_test_table')
.dropTableIfExists('rename_column_foreign_test')
.dropTableIfExists('rename_column_test')
.dropTableIfExists('should_not_be_run')
@ -87,9 +88,9 @@ module.exports = function(knex) {
}
table.timestamps();
}).testSql(function(tester) {
tester('mysql', ['create table `test_table_one` (`id` bigint unsigned not null auto_increment primary key, `first_name` varchar(255), `last_name` varchar(255), `email` varchar(255) null, `logins` int default \'1\', `about` text comment \'A comment.\', `created_at` datetime, `updated_at` datetime) default character set utf8 engine = InnoDB comment = \'A table comment.\'','alter table `test_table_one` add index test_table_one_first_name_index(`first_name`)','alter table `test_table_one` add unique test_table_one_email_unique(`email`)','alter table `test_table_one` add index test_table_one_logins_index(`logins`)']);
tester('pg', ['create table "test_table_one" ("id" bigserial primary key, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255) null, "logins" integer default \'1\', "about" text, "created_at" timestamptz, "updated_at" timestamptz)','comment on table "test_table_one" is \'A table comment.\'',"comment on column \"test_table_one\".\"logins\" is NULL",'comment on column "test_table_one"."about" is \'A comment.\'','create index test_table_one_first_name_index on "test_table_one" ("first_name")','alter table "test_table_one" add constraint test_table_one_email_unique unique ("email")','create index test_table_one_logins_index on "test_table_one" ("logins")']);
tester('sqlite3', ['create table "test_table_one" ("id" integer not null primary key autoincrement, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255) null, "logins" integer default \'1\', "about" text, "created_at" datetime, "updated_at" datetime)','create index test_table_one_first_name_index on "test_table_one" ("first_name")','create unique index test_table_one_email_unique on "test_table_one" ("email")','create index test_table_one_logins_index on "test_table_one" ("logins")']);
tester('mysql', ['create table `test_table_one` (`id` bigint unsigned not null auto_increment primary key, `first_name` varchar(255), `last_name` varchar(255), `email` varchar(255) null, `logins` int default \'1\', `about` text comment \'A comment.\', `created_at` datetime, `updated_at` datetime) default character set utf8 engine = InnoDB comment = \'A table comment.\'','alter table `test_table_one` add index `test_table_one_first_name_index`(`first_name`)','alter table `test_table_one` add unique `test_table_one_email_unique`(`email`)','alter table `test_table_one` add index `test_table_one_logins_index`(`logins`)']);
tester('pg', ['create table "test_table_one" ("id" bigserial primary key, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255) null, "logins" integer default \'1\', "about" text, "created_at" timestamptz, "updated_at" timestamptz)','comment on table "test_table_one" is \'A table comment.\'',"comment on column \"test_table_one\".\"logins\" is NULL",'comment on column "test_table_one"."about" is \'A comment.\'','create index "test_table_one_first_name_index" on "test_table_one" ("first_name")','alter table "test_table_one" add constraint "test_table_one_email_unique" unique ("email")','create index "test_table_one_logins_index" on "test_table_one" ("logins")']);
tester('sqlite3', ['create table "test_table_one" ("id" integer not null primary key autoincrement, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255) null, "logins" integer default \'1\', "about" text, "created_at" datetime, "updated_at" datetime)','create index "test_table_one_first_name_index" on "test_table_one" ("first_name")','create unique index "test_table_one_email_unique" on "test_table_one" ("email")','create index "test_table_one_logins_index" on "test_table_one" ("logins")']);
tester('oracle', [
'create table "test_table_one" ("id" number(20, 0) not null primary key, "first_name" varchar2(255), "last_name" varchar2(255), "email" varchar2(255) null, "logins" integer default \'1\', "about" varchar2(4000), "created_at" timestamp with time zone, "updated_at" timestamp with time zone)',
'comment on table "test_table_one" is \'A table comment.\'',
@ -133,7 +134,7 @@ module.exports = function(knex) {
table.integer('main').notNullable().primary();
table.text('paragraph').defaultTo('Lorem ipsum Qui quis qui in.');
}).testSql(function(tester) {
tester('mysql', ['create table `test_table_three` (`main` int not null, `paragraph` text) default character set utf8 engine = InnoDB','alter table `test_table_three` add primary key test_table_three_main_primary(`main`)']);
tester('mysql', ['create table `test_table_three` (`main` int not null, `paragraph` text) default character set utf8 engine = InnoDB','alter table `test_table_three` add primary key `test_table_three_main_primary`(`main`)']);
tester('pg', ['create table "test_table_three" ("main" integer not null, "paragraph" text default \'Lorem ipsum Qui quis qui in.\')','alter table "test_table_three" add primary key ("main")']);
tester('sqlite3', ['create table "test_table_three" ("main" integer not null, "paragraph" text default \'Lorem ipsum Qui quis qui in.\', primary key ("main"))']);
tester('oracle', ['create table "test_table_three" ("main" integer not null, "paragraph" clob default \'Lorem ipsum Qui quis qui in.\')','alter table "test_table_three" add primary key ("main")']);
@ -163,8 +164,8 @@ module.exports = function(knex) {
.references('id')
.inTable('test_table_two');
}).testSql(function(tester) {
tester('mysql', ['create table `test_foreign_table_two` (`id` int unsigned not null auto_increment primary key, `fkey_two` int unsigned) default character set utf8','alter table `test_foreign_table_two` add constraint test_foreign_table_two_fkey_two_foreign foreign key (`fkey_two`) references `test_table_two` (`id`)']);
tester('pg', ['create table "test_foreign_table_two" ("id" serial primary key, "fkey_two" integer)','alter table "test_foreign_table_two" add constraint test_foreign_table_two_fkey_two_foreign foreign key ("fkey_two") references "test_table_two" ("id")']);
tester('mysql', ['create table `test_foreign_table_two` (`id` int unsigned not null auto_increment primary key, `fkey_two` int unsigned) default character set utf8','alter table `test_foreign_table_two` add constraint `test_foreign_table_two_fkey_two_foreign` foreign key (`fkey_two`) references `test_table_two` (`id`)']);
tester('pg', ['create table "test_foreign_table_two" ("id" serial primary key, "fkey_two" integer)','alter table "test_foreign_table_two" add constraint "test_foreign_table_two_fkey_two_foreign" foreign key ("fkey_two") references "test_table_two" ("id")']);
tester('sqlite3', ['create table "test_foreign_table_two" ("id" integer not null primary key autoincrement, "fkey_two" integer, foreign key("fkey_two") references "test_table_two"("id"))']);
tester('oracle', [
'create table "test_foreign_table_two" ("id" integer not null primary key, "fkey_two" integer)',
@ -199,9 +200,9 @@ module.exports = function(knex) {
table.tinyint('status');
table.unique(['column_a', 'column_b']);
}).testSql(function(tester) {
tester('mysql', ['create table `composite_key_test` (`column_a` int, `column_b` int, `details` text, `status` tinyint) default character set utf8','alter table `composite_key_test` add unique composite_key_test_column_a_column_b_unique(`column_a`, `column_b`)']);
tester('pg', ['create table "composite_key_test" ("column_a" integer, "column_b" integer, "details" text, "status" smallint)','alter table "composite_key_test" add constraint composite_key_test_column_a_column_b_unique unique ("column_a", "column_b")']);
tester('sqlite3', ['create table "composite_key_test" ("column_a" integer, "column_b" integer, "details" text, "status" tinyint)','create unique index composite_key_test_column_a_column_b_unique on "composite_key_test" ("column_a", "column_b")']);
tester('mysql', ['create table `composite_key_test` (`column_a` int, `column_b` int, `details` text, `status` tinyint) default character set utf8','alter table `composite_key_test` add unique `composite_key_test_column_a_column_b_unique`(`column_a`, `column_b`)']);
tester('pg', ['create table "composite_key_test" ("column_a" integer, "column_b" integer, "details" text, "status" smallint)','alter table "composite_key_test" add constraint "composite_key_test_column_a_column_b_unique" unique ("column_a", "column_b")']);
tester('sqlite3', ['create table "composite_key_test" ("column_a" integer, "column_b" integer, "details" text, "status" tinyint)','create unique index "composite_key_test_column_a_column_b_unique" on "composite_key_test" ("column_a", "column_b")']);
tester('oracle', ['create table "composite_key_test" ("column_a" integer, "column_b" integer, "details" clob, "status" smallint)','alter table "composite_key_test" add constraint "zYmMt0VQwlLZ20XnrMicXZ0ufZk" unique ("column_a", "column_b")']);
tester('mssql', ['CREATE TABLE [composite_key_test] ([column_a] int, [column_b] int, [details] nvarchar(max), [status] tinyint, CONSTRAINT composite_key_test_column_a_column_b_unique UNIQUE ([column_a], [column_b]))']);
}).then(function() {
@ -266,6 +267,45 @@ module.exports = function(knex) {
});
});
it('accepts table names starting with numeric values', function() {
return knex.schema
.createTable('10_test_table', function(table) {
table.bigIncrements('id');
table.string('first_name').index();
table.string('last_name');
table.string('email').unique().nullable();
table.integer('logins').defaultTo(1).index().comment();
}).testSql(function(tester) {
tester('mysql', [
'create table `10_test_table` (`id` bigint unsigned not null auto_increment primary key, `first_name` varchar(255), `last_name` varchar(255), `email` varchar(255) null, `logins` int default \'1\') default character set utf8',
'alter table `10_test_table` add index `10_test_table_first_name_index`(`first_name`)',
'alter table `10_test_table` add unique `10_test_table_email_unique`(`email`)',
'alter table `10_test_table` add index `10_test_table_logins_index`(`logins`)'
]);
tester('pg', [
'create table "10_test_table" ("id" bigserial primary key, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255) null, "logins" integer default \'1\')',
'comment on column \"10_test_table\".\"logins\" is NULL',
'create index "10_test_table_first_name_index" on "10_test_table" ("first_name")',
'alter table "10_test_table" add constraint "10_test_table_email_unique" unique ("email")',
'create index "10_test_table_logins_index" on "10_test_table" ("logins")'
]);
tester('sqlite3', [
'create table "10_test_table" ("id" integer not null primary key autoincrement, "first_name" varchar(255), "last_name" varchar(255), "email" varchar(255) null, "logins" integer default \'1\')',
'create index "10_test_table_first_name_index" on "10_test_table" ("first_name")',
'create unique index "10_test_table_email_unique" on "10_test_table" ("email")',
'create index "10_test_table_logins_index" on "10_test_table" ("logins")'
]);
tester('oracle', [
'create table "10_test_table" ("id" number(20, 0) not null primary key, "first_name" varchar2(255), "last_name" varchar2(255), "email" varchar2(255) null, "logins" integer default \'1\')',
"begin execute immediate 'create sequence \"10_test_table_seq\"'; exception when others then if sqlcode != -955 then raise; end if; end;",
"create or replace trigger \"10_test_table_id_trg\" before insert on \"10_test_table\" for each row when (new.\"id\" is null) begin select \"10_test_table_seq\".nextval into :new.\"id\" from dual; end;",
"comment on column \"10_test_table\".\"logins\" is \'\'",
'create index "NkZo/dGRI9O73/NE2fHo+35d4jk" on "10_test_table" ("first_name")',
'alter table "10_test_table" add constraint "10_test_table_email_unique" unique ("email")',
'create index "10_test_table_logins_index" on "10_test_table" ("logins")'
]);
});
});
});
describe('table', function() {

22
test/unit/schema/mssql.js
View File

@ -89,7 +89,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT users_foo_unique');
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT [users_foo_unique]');
});
it('test drop unique, custom', function() {
@ -98,7 +98,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT foo');
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT [foo]');
});
it('test drop index', function() {
@ -107,7 +107,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('DROP INDEX users_foo_index ON [users]');
expect(tableSql[0].sql).to.equal('DROP INDEX [users_foo_index] ON [users]');
});
it('test drop index, custom', function() {
@ -116,7 +116,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('DROP INDEX foo ON [users]');
expect(tableSql[0].sql).to.equal('DROP INDEX [foo] ON [users]');
});
it('test drop foreign', function() {
@ -125,7 +125,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT users_foo_foreign');
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT [users_foo_foreign]');
});
it('test drop foreign, custom', function() {
@ -134,7 +134,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT foo');
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT [foo]');
});
it('test drop timestamps', function() {
@ -170,7 +170,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('CREATE UNIQUE INDEX bar ON [users] ([foo])');
expect(tableSql[0].sql).to.equal('CREATE UNIQUE INDEX [bar] ON [users] ([foo])');
});
it('test adding index', function() {
@ -179,7 +179,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('CREATE INDEX baz ON [users] ([foo], [bar])');
expect(tableSql[0].sql).to.equal('CREATE INDEX [baz] ON [users] ([foo], [bar])');
});
it('test adding foreign key', function() {
@ -188,7 +188,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD CONSTRAINT users_foo_id_foreign FOREIGN KEY ([foo_id]) REFERENCES [orders] ([id])');
expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD CONSTRAINT [users_foo_id_foreign] FOREIGN KEY ([foo_id]) REFERENCES [orders] ([id])');
});
it("adds foreign key with onUpdate and onDelete", function() {
@ -197,7 +197,7 @@ describe("MSSQL SchemaBuilder", function() {
table.integer('account_id').notNull().references('id').inTable('accounts').onUpdate('cascade');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('CREATE TABLE [person] ([user_id] int not null, [account_id] int not null, CONSTRAINT person_user_id_foreign FOREIGN KEY ([user_id]) REFERENCES [users] ([id]) ON DELETE SET NULL, CONSTRAINT person_account_id_foreign FOREIGN KEY ([account_id]) REFERENCES [accounts] ([id]) ON UPDATE cascade)');
expect(tableSql[0].sql).to.equal('CREATE TABLE [person] ([user_id] int not null, [account_id] int not null, CONSTRAINT [person_user_id_foreign] FOREIGN KEY ([user_id]) REFERENCES [users] ([id]) ON DELETE SET NULL, CONSTRAINT [person_account_id_foreign] FOREIGN KEY ([account_id]) REFERENCES [accounts] ([id]) ON UPDATE cascade)');
});
it('test adding incrementing id', function() {
@ -457,7 +457,7 @@ describe("MSSQL SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('ALTER TABLE [composite_key_test] DROP CONSTRAINT composite_key_test_column_a_column_b_unique');
expect(tableSql[0].sql).to.equal('ALTER TABLE [composite_key_test] DROP CONSTRAINT [composite_key_test_column_a_column_b_unique]');
});
it('allows default as alias for defaultTo', function() {

28
test/unit/schema/mysql.js
View File

@ -109,7 +109,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` drop index users_foo_unique');
expect(tableSql[0].sql).to.equal('alter table `users` drop index `users_foo_unique`');
});
it('test drop unique, custom', function() {
@ -118,7 +118,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` drop index foo');
expect(tableSql[0].sql).to.equal('alter table `users` drop index `foo`');
});
it('test drop index', function() {
@ -127,7 +127,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` drop index users_foo_index');
expect(tableSql[0].sql).to.equal('alter table `users` drop index `users_foo_index`');
});
it('test drop index, custom', function() {
@ -136,7 +136,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` drop index foo');
expect(tableSql[0].sql).to.equal('alter table `users` drop index `foo`');
});
it('test drop foreign', function() {
@ -145,7 +145,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` drop foreign key users_foo_foreign');
expect(tableSql[0].sql).to.equal('alter table `users` drop foreign key `users_foo_foreign`');
});
it('test drop foreign, custom', function() {
@ -154,7 +154,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` drop foreign key foo');
expect(tableSql[0].sql).to.equal('alter table `users` drop foreign key `foo`');
});
it('test drop timestamps', function() {
@ -179,7 +179,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` add primary key bar(`foo`)');
expect(tableSql[0].sql).to.equal('alter table `users` add primary key `bar`(`foo`)');
});
it('test adding unique key', function() {
@ -188,7 +188,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` add unique bar(`foo`)');
expect(tableSql[0].sql).to.equal('alter table `users` add unique `bar`(`foo`)');
});
it('test adding index', function() {
@ -197,7 +197,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` add index baz(`foo`, `bar`)');
expect(tableSql[0].sql).to.equal('alter table `users` add index `baz`(`foo`, `bar`)');
});
it('test adding foreign key', function() {
@ -206,7 +206,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `users` add constraint users_foo_id_foreign foreign key (`foo_id`) references `orders` (`id`)');
expect(tableSql[0].sql).to.equal('alter table `users` add constraint `users_foo_id_foreign` foreign key (`foo_id`) references `orders` (`id`)');
});
it("adds foreign key with onUpdate and onDelete", function() {
@ -215,8 +215,8 @@ describe(dialect + " SchemaBuilder", function() {
table.integer('account_id').notNull().references('id').inTable('accounts').onUpdate('cascade');
}).toSQL();
equal(3, tableSql.length);
expect(tableSql[1].sql).to.equal('alter table `person` add constraint person_user_id_foreign foreign key (`user_id`) references `users` (`id`) on delete SET NULL');
expect(tableSql[2].sql).to.equal('alter table `person` add constraint person_account_id_foreign foreign key (`account_id`) references `accounts` (`id`) on update cascade');
expect(tableSql[1].sql).to.equal('alter table `person` add constraint `person_user_id_foreign` foreign key (`user_id`) references `users` (`id`) on delete SET NULL');
expect(tableSql[2].sql).to.equal('alter table `person` add constraint `person_account_id_foreign` foreign key (`account_id`) references `accounts` (`id`) on update cascade');
});
it('test adding incrementing id', function() {
@ -476,7 +476,7 @@ describe(dialect + " SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table `composite_key_test` drop index composite_key_test_column_a_column_b_unique');
expect(tableSql[0].sql).to.equal('alter table `composite_key_test` drop index `composite_key_test_column_a_column_b_unique`');
});
it('allows default as alias for defaultTo', function() {
@ -499,4 +499,4 @@ describe(dialect + " SchemaBuilder", function() {
});
}
}

34
test/unit/schema/postgres.js
View File

@ -99,7 +99,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.dropUnique('foo');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint users_foo_unique');
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint "users_foo_unique"');
});
it("drop unique, custom", function() {
@ -107,7 +107,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.dropUnique(null, 'foo');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint foo');
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint "foo"');
});
it("drop index", function() {
@ -115,7 +115,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.dropIndex('foo');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('drop index users_foo_index');
expect(tableSql[0].sql).to.equal('drop index "users_foo_index"');
});
it("drop index, custom", function() {
@ -123,7 +123,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.dropIndex(null, 'foo');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('drop index foo');
expect(tableSql[0].sql).to.equal('drop index "foo"');
});
it("drop foreign", function() {
@ -131,7 +131,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.dropForeign('foo');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint users_foo_foreign');
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint "users_foo_foreign"');
});
it("drop foreign", function() {
@ -139,7 +139,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.dropForeign(null, 'foo');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint foo');
expect(tableSql[0].sql).to.equal('alter table "users" drop constraint "foo"');
});
it("drop timestamps", function() {
@ -177,7 +177,7 @@ describe("PostgreSQL SchemaBuilder", function() {
tableSql = client.schemaBuilder().createTable('accounts', function(table) {
table.integer('account_id').references('users.id');
}).toSQL();
expect(tableSql[1].sql).to.equal('alter table "accounts" add constraint accounts_account_id_foreign foreign key ("account_id") references "users" ("id")');
expect(tableSql[1].sql).to.equal('alter table "accounts" add constraint "accounts_account_id_foreign" foreign key ("account_id") references "users" ("id")');
});
it("adds foreign key with onUpdate and onDelete", function() {
@ -186,8 +186,8 @@ describe("PostgreSQL SchemaBuilder", function() {
table.integer('account_id').notNull().references('id').inTable('accounts').onUpdate('cascade');
}).toSQL();
equal(3, tableSql.length);
expect(tableSql[1].sql).to.equal('alter table "person" add constraint person_user_id_foreign foreign key ("user_id") references "users" ("id") on delete SET NULL');
expect(tableSql[2].sql).to.equal('alter table "person" add constraint person_account_id_foreign foreign key ("account_id") references "accounts" ("id") on update cascade');
expect(tableSql[1].sql).to.equal('alter table "person" add constraint "person_user_id_foreign" foreign key ("user_id") references "users" ("id") on delete SET NULL');
expect(tableSql[2].sql).to.equal('alter table "person" add constraint "person_account_id_foreign" foreign key ("account_id") references "accounts" ("id") on update cascade');
});
it("adding unique key", function() {
@ -195,7 +195,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.unique('foo', 'bar');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" add constraint bar unique ("foo")');
expect(tableSql[0].sql).to.equal('alter table "users" add constraint "bar" unique ("foo")');
});
it("adding unique key fluently", function() {
@ -204,7 +204,7 @@ describe("PostgreSQL SchemaBuilder", function() {
}).toSQL();
equal(2, tableSql.length);
expect(tableSql[0].sql).to.equal('create table "users" ("email" varchar(255))');
expect(tableSql[1].sql).to.equal('alter table "users" add constraint users_email_unique unique ("email")');
expect(tableSql[1].sql).to.equal('alter table "users" add constraint "users_email_unique" unique ("email")');
});
it("adding index without value", function() {
@ -212,7 +212,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.index(['foo', 'bar']);
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('create index users_foo_bar_index on "users" ("foo", "bar")');
expect(tableSql[0].sql).to.equal('create index "users_foo_bar_index" on "users" ("foo", "bar")');
});
it("adding index", function() {
@ -220,7 +220,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.index(['foo', 'bar'], 'baz');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('create index baz on "users" ("foo", "bar")');
expect(tableSql[0].sql).to.equal('create index "baz" on "users" ("foo", "bar")');
});
it("adding index fluently", function() {
@ -229,7 +229,7 @@ describe("PostgreSQL SchemaBuilder", function() {
}).toSQL();
equal(2, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" add column "name" varchar(255)');
expect(tableSql[1].sql).to.equal('create index users_name_index on "users" ("name")');
expect(tableSql[1].sql).to.equal('create index "users_name_index" on "users" ("name")');
});
it("adding index with an index type", function() {
@ -237,7 +237,7 @@ describe("PostgreSQL SchemaBuilder", function() {
table.index(['foo', 'bar'], 'baz', 'gist');
}).toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal('create index baz on "users" using gist ("foo", "bar")');
expect(tableSql[0].sql).to.equal('create index "baz" on "users" using gist ("foo", "bar")');
});
it("adding index with an index type fluently", function() {
@ -246,7 +246,7 @@ describe("PostgreSQL SchemaBuilder", function() {
}).toSQL();
equal(2, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" add column "name" varchar(255)');
expect(tableSql[1].sql).to.equal('create index baz on "users" using gist ("name")');
expect(tableSql[1].sql).to.equal('create index "baz" on "users" using gist ("name")');
});
it("adding index with an index type and default name fluently", function() {
@ -255,7 +255,7 @@ describe("PostgreSQL SchemaBuilder", function() {
}).toSQL();
equal(2, tableSql.length);
expect(tableSql[0].sql).to.equal('alter table "users" add column "name" varchar(255)');
expect(tableSql[1].sql).to.equal('create index users_name_index on "users" using gist ("name")');
expect(tableSql[1].sql).to.equal('create index "users_name_index" on "users" using gist ("name")');
});
it("adding incrementing id", function() {

16
test/unit/schema/sqlite3.js
View File

@ -57,7 +57,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'drop index users_foo_unique');
equal(tableSql[0].sql, 'drop index "users_foo_unique"');
});
it("drop unique, custom", function() {
@ -66,7 +66,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'drop index foo');
equal(tableSql[0].sql, 'drop index "foo"');
});
it("drop index", function() {
@ -75,7 +75,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'drop index users_foo_index');
equal(tableSql[0].sql, 'drop index "users_foo_index"');
});
it("drop index, custom", function() {
@ -84,7 +84,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'drop index foo');
equal(tableSql[0].sql, 'drop index "foo"');
});
it("rename table", function() {
@ -160,7 +160,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'create unique index users_foo_unique on "users" ("foo")');
equal(tableSql[0].sql, 'create unique index "users_foo_unique" on "users" ("foo")');
});
it("adding unique key with specific name", function() {
@ -169,7 +169,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'create unique index bar on "users" ("foo")');
equal(tableSql[0].sql, 'create unique index "bar" on "users" ("foo")');
});
it("adding index", function() {
@ -178,7 +178,7 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
equal(1, tableSql.length);
equal(tableSql[0].sql, 'create index baz on "users" ("foo", "bar")');
equal(tableSql[0].sql, 'create index "baz" on "users" ("foo", "bar")');
});
it("adding incrementing id", function() {
@ -445,4 +445,4 @@ describe("SQLite SchemaBuilder", function() {
}).toSQL();
});
});
});
});