不要怂,就是干,撸起袖子干!

Commit da93914c by Jan Aagaard Meier

Fix an issue with dialect.supports for abstract dialect being overwritten

1 parent 322ae24a
......@@ -11,9 +11,7 @@ var MariaDialect = function(sequelize) {
this.connectionManager.initPools();
};
MariaDialect.prototype = _.defaults({
'LIMIT ON UPDATE': true
}, MySQL.prototype);
MariaDialect.prototype = MySQL.prototype;
MariaDialect.prototype.Query = Query;
......
......@@ -11,7 +11,7 @@ var MysqlDialect = function(sequelize) {
this.connectionManager.initPools();
};
MysqlDialect.prototype.supports = _.merge(Abstract.prototype.supports, {
MysqlDialect.prototype.supports = _.merge(_.cloneDeep(Abstract.prototype.supports), {
'VALUES ()': true,
'LIMIT ON UPDATE': true,
lock: true,
......
......@@ -11,7 +11,7 @@ var PostgresDialect = function(sequelize) {
this.connectionManager.initPools();
};
PostgresDialect.prototype.supports = _.merge(Abstract.prototype.supports, {
PostgresDialect.prototype.supports = _.merge(_.cloneDeep(Abstract.prototype.supports), {
'RETURNING': true,
'DEFAULT VALUES': true,
schemas: true,
......
......@@ -10,7 +10,7 @@ var SqliteDialect = function(sequelize) {
this.connectionManager = new ConnectionManager(this, sequelize);
};
SqliteDialect.prototype.supports = _.merge(Abstract.prototype.supports, {
SqliteDialect.prototype.supports = _.merge(_.cloneDeep(Abstract.prototype.supports), {
'DEFAULT': false,
'DEFAULT VALUES': true,
index: {
......
......@@ -1297,7 +1297,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
});
it('makes join table non-paranoid by default', function () {
var paranoidSequelize = new Sequelize('','','', {
var paranoidSequelize = Support.createSequelizeInstance({
define: {
paranoid: true
}
......
......@@ -32,7 +32,6 @@ describe(Support.getTestDialectTeaser("Sequelize"), function () {
, connectionSpy = ConnectionManager.prototype.connect = chai.spy(ConnectionManager.prototype.connect);
var sequelize = Support.createSequelizeInstance({
dialect: dialect,
pool: {
minConnections: 2
}
......
......@@ -87,7 +87,7 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
// how could we enforce an authentication error in sqlite?
} else {
it("gets triggered once an error occurs", function(done) {
var sequelize = Support.createSequelizeInstance({ dialect: Support.getTestDialect() });
var sequelize = Support.createSequelizeInstance();
// lets overwrite the host to get an error
sequelize.config.username = 'foobarbaz';
......
......@@ -68,7 +68,7 @@ var Support = {
createSequelizeInstance: function(options) {
options = options || {};
options.dialect = options.dialect || 'mysql';
options.dialect = this.getTestDialect();
var config = Config[options.dialect];
......@@ -187,7 +187,7 @@ var Support = {
}
};
var sequelize = Support.createSequelizeInstance({ dialect: Support.getTestDialect() });
var sequelize = Support.createSequelizeInstance();
// For Postgres' HSTORE functionality and to properly execute it's commands we'll need this...
before(function() {
......
......@@ -16,7 +16,6 @@ if (dialect !== 'sqlite') {
beforeEach(function () {
this.sequelizeWithTimezone = Support.createSequelizeInstance({
timezone: '+07:00',
dialect: dialect
});
});
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!