Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit 39aafb51 by Michael Kearns
Options

query-interface tests make stronger assertions 

* all tests covering functionality which modifies schema
  now verify that the schema has actually changed, instead of
  just verifying against the number of logs output
* remove assertions against sql count in query-interface.test
* remove unused rawSelect against table in test

Fixes required for new query-interface tests for PG / MySQL / MariaDB

* PG: changing a column to DataTypes.FLOAT results in it being stored (and
  returned as) 'DOUBLE PRECISION'
* ensure that test schema is torn down after each test, to avoid tests
  interacting with each other
* remove unneeded calls to dropAllSchemas in query-interface.test.js
  - this is done in the afterEach call now
* MySQL/MariaDB: we have to change our expectation depending on the
  dialect, as the DataTypes names are too inconsistent
1 parent 53a03c7d
Inline Side-by-side
Showing with 125 additions and 139 deletions
test/integration/query-interface.test.js
...@@ -21,26 +21,20 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -21,26 +21,20 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
this.queryInterface = this.sequelize.getQueryInterface(); this.queryInterface = this.sequelize.getQueryInterface();
}); });
afterEach(function() {
return this.sequelize.dropAllSchemas();
});
describe('dropAllTables', function() { describe('dropAllTables', function() {
it('should drop all tables', function() { it('should drop all tables', function() {
var self = this; var self = this;
return this.queryInterface.dropAllTables().then(function() { return this.queryInterface.dropAllTables().then(function() {
return self.queryInterface.showAllTables({logging: log}).then(function(tableNames) { return self.queryInterface.showAllTables().then(function(tableNames) {
expect(count).to.be.equal(1);
count = 0;
expect(tableNames).to.be.empty; expect(tableNames).to.be.empty;
return self.queryInterface.createTable('table', { name: DataTypes.STRING }, { return self.queryInterface.createTable('table', { name: DataTypes.STRING }).then(function() {
logging: log return self.queryInterface.showAllTables().then(function(tableNames) {
}).then(function() {
expect(count).to.be.equal(1);
count = 0;
return self.queryInterface.showAllTables({logging: log}).then(function(tableNames) {
expect(count).to.be.equal(1);
count = 0;
expect(tableNames).to.have.length(1); expect(tableNames).to.have.length(1);
return self.queryInterface.dropAllTables({logging: log}).then(function() { return self.queryInterface.dropAllTables().then(function() {
expect(count).to.be.at.least(1);
count = 0;
return self.queryInterface.showAllTables().then(function(tableNames) { return self.queryInterface.showAllTables().then(function(tableNames) {
expect(tableNames).to.be.empty; expect(tableNames).to.be.empty;
}); });
...@@ -71,9 +65,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -71,9 +65,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
describe('indexes', function() { describe('indexes', function() {
beforeEach(function() { beforeEach(function() {
var self = this; var self = this;
return this.queryInterface.dropTable('Group', {logging: log}).then(function() { return this.queryInterface.dropTable('Group').then(function() {
expect(count).to.be.at.least(1);
count = 0;
return self.queryInterface.createTable('Group', { return self.queryInterface.createTable('Group', {
username: DataTypes.STRING, username: DataTypes.STRING,
isAdmin: DataTypes.BOOLEAN, isAdmin: DataTypes.BOOLEAN,
...@@ -84,20 +76,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -84,20 +76,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
it('adds, reads and removes an index to the table', function() { it('adds, reads and removes an index to the table', function() {
var self = this; var self = this;
return this.queryInterface.addIndex('Group', ['username', 'isAdmin'], { return this.queryInterface.addIndex('Group', ['username', 'isAdmin']).then(function() {
logging: log return self.queryInterface.showIndex('Group').then(function(indexes) {
}).then(function() {
expect(count).to.be.equal(1);
count = 0;
return self.queryInterface.showIndex('Group', {logging: log}).then(function(indexes) {
expect(count).to.be.equal(1);
count = 0;
var indexColumns = _.uniq(indexes.map(function(index) { return index.name; })); var indexColumns = _.uniq(indexes.map(function(index) { return index.name; }));
expect(indexColumns).to.include('group_username_is_admin'); expect(indexColumns).to.include('group_username_is_admin');
return self.queryInterface.removeIndex('Group', ['username', 'isAdmin'], {logging: log}).then(function() { return self.queryInterface.removeIndex('Group', ['username', 'isAdmin']).then(function() {
expect(count).to.be.equal(1);
count = 0;
return self.queryInterface.showIndex('Group').then(function(indexes) { return self.queryInterface.showIndex('Group').then(function(indexes) {
indexColumns = _.uniq(indexes.map(function(index) { return index.name; })); indexColumns = _.uniq(indexes.map(function(index) { return index.name; }));
expect(indexColumns).to.be.empty; expect(indexColumns).to.be.empty;
...@@ -109,9 +92,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -109,9 +92,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
it('works with schemas', function() { it('works with schemas', function() {
var self = this; var self = this;
return self.sequelize.dropAllSchemas({logging: log}).then(function() { return self.sequelize.createSchema('schema').then(function() {
return self.sequelize.createSchema('schema', {logging: log});
}).then(function() {
return self.queryInterface.createTable('table', { return self.queryInterface.createTable('table', {
name: { name: {
type: DataTypes.STRING type: DataTypes.STRING
...@@ -126,19 +107,16 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -126,19 +107,16 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return self.queryInterface.addIndex({ return self.queryInterface.addIndex({
schema: 'schema', schema: 'schema',
tableName: 'table' tableName: 'table'
}, ['name', 'isAdmin'], { }, ['name', 'isAdmin'], null, 'schema_table').then(function() {
logging: log return self.queryInterface.showIndex({
}, 'schema_table').then(function() { schema: 'schema',
return self.queryInterface.showIndex({ tableName: 'table'
schema: 'schema', }).then(function(indexes) {
tableName: 'table' expect(indexes.length).to.eq(1);
}, {logging: log}).then(function(indexes) { });
expect(indexes.length).to.eq(1);
count = 0;
}); });
}); });
}); });
});
it('does not fail on reserved keywords', function() { it('does not fail on reserved keywords', function() {
return this.queryInterface.addIndex('Group', ['from']); return this.queryInterface.addIndex('Group', ['from']);
...@@ -159,10 +137,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -159,10 +137,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}, { freezeTableName: true }); }, { freezeTableName: true });
return Users.sync({ force: true }).then(function() { return Users.sync({ force: true }).then(function() {
return self.queryInterface.describeTable('_Users', {logging: log}).then(function(metadata) { return self.queryInterface.describeTable('_Users').then(function(metadata) {
expect(count).to.be.at.least(1);
count = 0;
var id = metadata.id; var id = metadata.id;
var username = metadata.username; var username = metadata.username;
var city = metadata.city; var city = metadata.city;
...@@ -225,6 +200,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -225,6 +200,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}); });
}); });
// FIXME: These tests should make assertions against the created table using describeTable
describe('createTable', function() { describe('createTable', function() {
it('should create a auto increment primary key', function() { it('should create a auto increment primary key', function() {
return this.queryInterface.createTable('TableWithPK', { return this.queryInterface.createTable('TableWithPK', {
...@@ -267,16 +243,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -267,16 +243,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
it('should work with schemas', function() { it('should work with schemas', function() {
var self = this; var self = this;
return self.sequelize.dropAllSchemas({logging: log}).then(function() { return self.sequelize.createSchema('hero').then(function() {
// TODO: FIXME: somehow these do not fire the logging function
if (dialect !== 'mysql' && dialect !== 'sqlite' && dialect !== 'mariadb') {
expect(count).to.be.above(0);
}
count = 0;
return self.sequelize.createSchema('hero', {logging: log});
}).then(function() {
expect(count).to.be.equal(1);
count = 0;
return self.queryInterface.createTable('User', { return self.queryInterface.createTable('User', {
name: { name: {
type: DataTypes.STRING type: DataTypes.STRING
...@@ -284,14 +251,6 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -284,14 +251,6 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}, { }, {
schema: 'hero' schema: 'hero'
}); });
}).then(function() {
return self.queryInterface.rawSelect('User', {
schema: 'hero',
logging: log
}, 'name');
}).then(function() {
expect(count).to.be.equal(1);
count = 0;
}); });
}); });
}); });
...@@ -304,33 +263,38 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -304,33 +263,38 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}, { freezeTableName: true }); }, { freezeTableName: true });
return Users.sync({ force: true }).then(function() { return Users.sync({ force: true }).then(function() {
return self.queryInterface.renameColumn('_Users', 'username', 'pseudo', {logging: log}).then(function() { return self.queryInterface.renameColumn('_Users', 'username', 'pseudo');
if (dialect === 'sqlite') }).bind(this).then(function() {
count++; return this.queryInterface.describeTable('_Users');
expect(count).to.be.equal(2); }).then(function (table) {
count = 0; expect(table).to.have.property('pseudo');
}); expect(table).to.not.have.property('username');
}); });
}); });
it('works with schemas', function() { it('works with schemas', function() {
var self = this; var self = this;
var Users = self.sequelize.define('User', { return self.sequelize.createSchema('archive').then(function() {
username: DataTypes.STRING var Users = self.sequelize.define('User', {
}, { username: DataTypes.STRING
tableName: 'Users', }, {
schema: 'archive' tableName: 'Users',
}); schema: 'archive'
});
return self.sequelize.dropAllSchemas().then(function() {
return self.sequelize.createSchema('archive');
}).then(function() {
return Users.sync({ force: true }).then(function() { return Users.sync({ force: true }).then(function() {
return self.queryInterface.renameColumn({ return self.queryInterface.renameColumn({
schema: 'archive', schema: 'archive',
tableName: 'Users' tableName: 'Users'
}, 'username', 'pseudo'); }, 'username', 'pseudo');
}); });
}).bind(this).then(function() {
return this.queryInterface.describeTable({
schema: 'archive',
tableName: 'Users'
});
}).then(function (table) {
expect(table).to.have.property('pseudo');
expect(table).to.not.have.property('username');
}); });
}); });
...@@ -345,6 +309,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -345,6 +309,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return Users.sync({ force: true }).then(function() { return Users.sync({ force: true }).then(function() {
return self.queryInterface.renameColumn('_Users', 'username', 'pseudo'); return self.queryInterface.renameColumn('_Users', 'username', 'pseudo');
}).bind(this).then(function() {
return this.queryInterface.describeTable('_Users');
}).then(function (table) {
expect(table).to.have.property('pseudo');
expect(table).to.not.have.property('username');
}); });
}); });
...@@ -360,6 +329,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -360,6 +329,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return Users.sync({ force: true }).then(function() { return Users.sync({ force: true }).then(function() {
return self.queryInterface.renameColumn('_Users', 'active', 'enabled'); return self.queryInterface.renameColumn('_Users', 'active', 'enabled');
}).bind(this).then(function() {
return this.queryInterface.describeTable('_Users');
}).then(function (table) {
expect(table).to.have.property('enabled');
expect(table).to.not.have.property('active');
}); });
}); });
...@@ -376,15 +350,18 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -376,15 +350,18 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return Fruits.sync({ force: true }).then(function() { return Fruits.sync({ force: true }).then(function() {
return self.queryInterface.renameColumn('Fruit', 'fruitId', 'fruit_id'); return self.queryInterface.renameColumn('Fruit', 'fruitId', 'fruit_id');
}).bind(this).then(function() {
return this.queryInterface.describeTable('Fruit');
}).then(function (table) {
expect(table).to.have.property('fruit_id');
expect(table).to.not.have.property('fruitId');
}); });
}); });
}); });
describe('changeColumn', function() { describe('changeColumn', function() {
it('should support schemas', function() { it('should support schemas', function() {
return this.sequelize.dropAllSchemas().bind(this).then(function() { return this.sequelize.createSchema('archive').bind(this).then(function() {
return this.sequelize.createSchema('archive');
}).then(function() {
return this.queryInterface.createTable({ return this.queryInterface.createTable({
tableName: 'users', tableName: 'users',
schema: 'archive' schema: 'archive'
...@@ -401,19 +378,25 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -401,19 +378,25 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
schema: 'archive' schema: 'archive'
}, 'currency', { }, 'currency', {
type: DataTypes.FLOAT type: DataTypes.FLOAT
}, {
logging: log
}).then(function() {
expect(count).to.be.equal(1);
count = 0;
}); });
}).then(function() {
return this.queryInterface.describeTable({
tableName: 'users',
schema: 'archive'
});
}).then(function (table) {
if (dialect === 'postgres' || dialect === 'postgres-native') {
expect(table.currency.type).to.equal('DOUBLE PRECISION');
} else {
expect(table.currency.type).to.equal('FLOAT');
}
}); });
}); });
}); });
it('should change columns', function() { it('should change columns', function() {
return this.queryInterface.createTable({ return this.queryInterface.createTable({
tableName: 'users', tableName: 'users'
}, { }, {
id: { id: {
type: DataTypes.INTEGER, type: DataTypes.INTEGER,
...@@ -425,13 +408,19 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -425,13 +408,19 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return this.queryInterface.changeColumn('users', 'currency', { return this.queryInterface.changeColumn('users', 'currency', {
type: DataTypes.FLOAT, type: DataTypes.FLOAT,
allowNull: true allowNull: true
}, {
logging: log
}).then(function() {
expect(count).to.be.equal(1);
count = 0;
}); });
}).then(function() {
return this.queryInterface.describeTable({
tableName: 'users'
});
}).then(function (table) {
if (dialect === 'postgres' || dialect === 'postgres-native') {
expect(table.currency.type).to.equal('DOUBLE PRECISION');
} else {
expect(table.currency.type).to.equal('FLOAT');
}
}); });
});
}); });
//SQlite navitely doesnt support ALTER Foreign key //SQlite navitely doesnt support ALTER Foreign key
...@@ -477,16 +466,17 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -477,16 +466,17 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}); });
} }
});
describe('addColumn', function() { describe('addColumn', function() {
beforeEach(function() { beforeEach(function() {
return this.queryInterface.createTable('users', { return this.sequelize.createSchema('archive').bind(this).then(function() {
id: { return this.queryInterface.createTable('users', {
type: DataTypes.INTEGER, id: {
primaryKey: true, type: DataTypes.INTEGER,
autoIncrement: true primaryKey: true,
} autoIncrement: true
}
});
}); });
}); });
...@@ -506,10 +496,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -506,10 +496,11 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}, },
onUpdate: 'cascade', onUpdate: 'cascade',
onDelete: 'set null' onDelete: 'set null'
}, {logging: log}); });
}).then(function() { }).then(function() {
expect(count).to.be.equal(1); return this.queryInterface.describeTable('users');
count = 0; }).then(function (table) {
expect(table).to.have.property('level_id');
}); });
}); });
...@@ -529,6 +520,13 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -529,6 +520,13 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
schema: 'archive' schema: 'archive'
}, 'level_id', { }, 'level_id', {
type: DataTypes.INTEGER type: DataTypes.INTEGER
}).bind(this).then(function() {
return this.queryInterface.describeTable({
tableName: 'users',
schema: 'archive'
});
}).then(function (table) {
expect(table).to.have.property('level_id');
}); });
}); });
}); });
...@@ -565,11 +563,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -565,11 +563,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}); });
it('should be able to remove a column with a default value', function() { it('should be able to remove a column with a default value', function() {
return this.queryInterface.removeColumn('users', 'firstName', { return this.queryInterface.removeColumn('users', 'firstName').bind(this).then(function() {
logging: log
}).bind(this).then(function() {
expect(count).to.be.at.least(1);
count = 0;
return this.queryInterface.describeTable('users'); return this.queryInterface.describeTable('users');
}).then(function(table) { }).then(function(table) {
expect(table).to.not.have.property('firstName'); expect(table).to.not.have.property('firstName');
...@@ -577,11 +571,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -577,11 +571,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
}); });
it('should be able to remove a column without default value', function() { it('should be able to remove a column without default value', function() {
return this.queryInterface.removeColumn('users', 'lastName', { return this.queryInterface.removeColumn('users', 'lastName').bind(this).then(function() {
logging: log
}).bind(this).then(function() {
expect(count).to.be.at.least(1);
count = 0;
return this.queryInterface.describeTable('users'); return this.queryInterface.describeTable('users');
}).then(function(table) { }).then(function(table) {
expect(table).to.not.have.property('lastName'); expect(table).to.not.have.property('lastName');
...@@ -591,22 +581,24 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -591,22 +581,24 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
describe('(with a schema)', function() { describe('(with a schema)', function() {
beforeEach(function() { beforeEach(function() {
return this.queryInterface.createTable({ return this.sequelize.createSchema('archive').bind(this).then(function() {
tableName: 'users', return this.queryInterface.createTable({
schema: 'archive' tableName: 'users',
}, { schema: 'archive'
id: { }, {
type: DataTypes.INTEGER, id: {
primaryKey: true, type: DataTypes.INTEGER,
autoIncrement: true primaryKey: true,
}, autoIncrement: true
firstName: { },
type: DataTypes.STRING, firstName: {
defaultValue: 'Someone' type: DataTypes.STRING,
}, defaultValue: 'Someone'
lastName: { },
type: DataTypes.STRING lastName: {
} type: DataTypes.STRING
}
});
}); });
}); });
...@@ -614,10 +606,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -614,10 +606,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return this.queryInterface.removeColumn({ return this.queryInterface.removeColumn({
tableName: 'users', tableName: 'users',
schema: 'archive' schema: 'archive'
}, 'firstName', {logging: log} }, 'firstName'
).bind(this).then(function() { ).bind(this).then(function() {
expect(count).to.be.at.least(1);
count = 0;
return this.queryInterface.describeTable({ return this.queryInterface.describeTable({
tableName: 'users', tableName: 'users',
schema: 'archive' schema: 'archive'
...@@ -631,10 +621,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -631,10 +621,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
return this.queryInterface.removeColumn({ return this.queryInterface.removeColumn({
tableName: 'users', tableName: 'users',
schema: 'archive' schema: 'archive'
}, 'lastName', {logging: log} }, 'lastName'
).bind(this).then(function() { ).bind(this).then(function() {
expect(count).to.be.at.least(1);
count = 0;
return this.queryInterface.describeTable({ return this.queryInterface.describeTable({
tableName: 'users', tableName: 'users',
schema: 'archive' schema: 'archive'
...@@ -692,10 +680,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() { ...@@ -692,10 +680,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), function() {
it('should get a list of foreign keys for the table', function() { it('should get a list of foreign keys for the table', function() {
var sql = this.queryInterface.QueryGenerator.getForeignKeysQuery('hosts', this.sequelize.config.database); var sql = this.queryInterface.QueryGenerator.getForeignKeysQuery('hosts', this.sequelize.config.database);
return this.sequelize.query(sql, {type: this.sequelize.QueryTypes.FOREIGNKEYS, logging: log}).then(function(fks) { return this.sequelize.query(sql, {type: this.sequelize.QueryTypes.FOREIGNKEYS}).then(function(fks) {
expect(count).to.be.equal(1);
expect(fks).to.have.length(3); expect(fks).to.have.length(3);
count = 0;
var keys = Object.keys(fks[0]), var keys = Object.keys(fks[0]),
keys2 = Object.keys(fks[1]), keys2 = Object.keys(fks[1]),
keys3 = Object.keys(fks[2]); keys3 = Object.keys(fks[2]);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!