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

Commit d2fda607 by Yoni Jah

Fixes #5390 - dialect mariaDB missing data-types

1 parent 2115a06d
......@@ -922,6 +922,7 @@ _.each(dataTypes, function (dataType) {
dataTypes.postgres = require('./dialects/postgres/data-types')(dataTypes);
dataTypes.mysql = require('./dialects/mysql/data-types')(dataTypes);
dataTypes.mariadb = dataTypes.mysql;
dataTypes.sqlite = require('./dialects/sqlite/data-types')(dataTypes);
dataTypes.mssql = require('./dialects/mssql/data-types')(dataTypes);
......
......@@ -386,6 +386,40 @@ describe(Support.getTestDialectTeaser('Sequelize'), function() {
}).to.throw(Error, 'Both `replacements` and `bind` cannot be set at the same time');
});
if (Support.dialectIsMySQL()) {
it.only('properly adds and escapes replacement value', function () {
var logSql,
number = 1,
date = new Date(),
string = 't\'e"st',
boolean = true,
buffer = new Buffer('t\'e"st');
date.setMilliseconds(0);
return this.sequelize.query({
query: 'select ? as number, ? as date,? as string,? as boolean,? as buffer',
values: [number, date, string, boolean, buffer]
}, {
type: this.sequelize.QueryTypes.SELECT,
logging: function(s) {
logSql = s;
}
}).then(function(result) {
var res = result[0] || {};
res.date = res.date && new Date(res.date);
res.boolean = res.boolean && true;
expect(res).to.deep.equal({
number : number,
date : date,
string : string,
boolean: boolean,
buffer : buffer
});
expect(logSql.indexOf('?')).to.equal(-1);
});
});
}
it('uses properties `query` and `values` if query is tagged', function() {
var logSql;
return this.sequelize.query({ query: 'select ? as foo, ? as bar', values: [1, 2] }, { type: this.sequelize.QueryTypes.SELECT, logging: function(s) { logSql = s; } }).then(function(result) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!