Skip to content

public / sequelize

Go to a project

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

Commit 4768e3c4 by Jan Aagaard Meier
Options

Merge pull request #5443 from sequelize/4306fix 

bug(postgres/truncate) Fix truncate with schema in postgres.
2 parents 28021915 35671ec6
Inline Side-by-side
Showing with 99 additions and 150 deletions
changelog.md
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- [FIXED] `updatedAt` and `createdAt` values are now set before validation [#5367](https://github.com/sequelize/sequelize/pull/5367) - [FIXED] `updatedAt` and `createdAt` values are now set before validation [#5367](https://github.com/sequelize/sequelize/pull/5367)
- [FIXED] `describeTable` maintains proper enum casing in mysql [#5321](https://github.com/sequelize/sequelize/pull/5321) - [FIXED] `describeTable` maintains proper enum casing in mysql [#5321](https://github.com/sequelize/sequelize/pull/5321)
- [FIXED] Parsing of dates in MySQL, when a named timezone is used [#4208](https://github.com/sequelize/sequelize/issues/4208) - [FIXED] Parsing of dates in MySQL, when a named timezone is used [#4208](https://github.com/sequelize/sequelize/issues/4208)
- [FIXED] Truncating in Postgres, when table has a schema [#4306](https://github.com/sequelize/sequelize/issues/4306)
# 3.19.0 # 3.19.0
- [ADDED] Geography support for postgres - [ADDED] Geography support for postgres
......
lib/dialects/postgres/query-generator.js
...@@ -5,7 +5,6 @@ var Utils = require('../../utils') ...@@ -5,7 +5,6 @@ var Utils = require('../../utils')
, util = require('util') , util = require('util')
, DataTypes = require('../../data-types') , DataTypes = require('../../data-types')
, AbstractQueryGenerator = require('../abstract/query-generator') , AbstractQueryGenerator = require('../abstract/query-generator')
, primaryKeys = {}
, semver = require('semver') , semver = require('semver')
, _ = require('lodash'); , _ = require('lodash');
...@@ -42,8 +41,6 @@ var QueryGenerator = { ...@@ -42,8 +41,6 @@ var QueryGenerator = {
options = Utils._.extend({ options = Utils._.extend({
}, options || {}); }, options || {});
primaryKeys[tableName] = [];
var databaseVersion = Utils._.get(self, 'sequelize.options.databaseVersion', 0); var databaseVersion = Utils._.get(self, 'sequelize.options.databaseVersion', 0);
//Postgres 9.0 does not support CREATE TABLE IF NOT EXISTS, 9.1 and above do //Postgres 9.0 does not support CREATE TABLE IF NOT EXISTS, 9.1 and above do
var query = 'CREATE TABLE ' + var query = 'CREATE TABLE ' +
...@@ -64,7 +61,7 @@ var QueryGenerator = { ...@@ -64,7 +61,7 @@ var QueryGenerator = {
attributes[attr] = attributes[attr].substring(0, i); attributes[attr] = attributes[attr].substring(0, i);
} }
var dataType = this.pgDataTypeMapping(tableName, attr, attributes[attr]); var dataType = this.dataTypeMapping(tableName, attr, attributes[attr]);
attrStr.push(this.quoteIdentifier(attr) + ' ' + dataType); attrStr.push(this.quoteIdentifier(attr) + ' ' + dataType);
} }
...@@ -82,9 +79,12 @@ var QueryGenerator = { ...@@ -82,9 +79,12 @@ var QueryGenerator = {
}); });
} }
var pks = primaryKeys[tableName].map(function(pk) { var pks = _.reduce(attributes, function (acc, attribute, key) {
return this.quoteIdentifier(pk); if (_.includes(attribute, 'PRIMARY KEY')) {
}.bind(this)).join(','); acc.push(this.quoteIdentifier(key));
}
return acc;
}.bind(this), []).join(',');
if (pks.length > 0) { if (pks.length > 0) {
values.attributes += ', PRIMARY KEY (' + pks + ')'; values.attributes += ', PRIMARY KEY (' + pks + ')';
...@@ -189,7 +189,7 @@ var QueryGenerator = { ...@@ -189,7 +189,7 @@ var QueryGenerator = {
attribute = Utils._.template('<%= key %> <%= definition %>')({ attribute = Utils._.template('<%= key %> <%= definition %>')({
key: this.quoteIdentifier(key), key: this.quoteIdentifier(key),
definition: this.pgDataTypeMapping(table, key, dbDataType) definition: this.dataTypeMapping(table, key, dbDataType)
}); });
return Utils._.template(query)({ return Utils._.template(query)({
...@@ -211,7 +211,7 @@ var QueryGenerator = { ...@@ -211,7 +211,7 @@ var QueryGenerator = {
, sql = []; , sql = [];
for (var attributeName in attributes) { for (var attributeName in attributes) {
var definition = this.pgDataTypeMapping(tableName, attributeName, attributes[attributeName]); var definition = this.dataTypeMapping(tableName, attributeName, attributes[attributeName]);
var attrSql = ''; var attrSql = '';
if (definition.indexOf('NOT NULL') > 0) { if (definition.indexOf('NOT NULL') > 0) {
...@@ -342,10 +342,10 @@ var QueryGenerator = { ...@@ -342,10 +342,10 @@ var QueryGenerator = {
options = options || {}; options = options || {};
tableName = Utils.removeTicks(this.quoteTable(tableName), '"'); tableName = this.quoteTable(tableName);
if (options.truncate === true) { if (options.truncate === true) {
query = 'TRUNCATE ' + QueryGenerator.quoteIdentifier(tableName); query = 'TRUNCATE ' + tableName;
if (options.cascade) { if (options.cascade) {
query += ' CASCADE'; query += ' CASCADE';
...@@ -358,34 +358,21 @@ var QueryGenerator = { ...@@ -358,34 +358,21 @@ var QueryGenerator = {
options.limit = 1; options.limit = 1;
} }
primaryKeys[tableName] = primaryKeys[tableName] || [];
if (!!model && primaryKeys[tableName].length < 1) {
primaryKeys[tableName] = Utils._.map(Object.keys(model.primaryKeys), function(k){
return model.primaryKeys[k].field;
});
}
if (options.limit) { if (options.limit) {
query = 'DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %><%= where %><%= limit %>)'; query = 'DELETE FROM <%= table %> WHERE <%= primaryKeys %> IN (SELECT <%= primaryKeysSelection %> FROM <%= table %><%= where %><%= limit %>)';
} else { } else {
query = 'DELETE FROM <%= table %><%= where %>'; query = 'DELETE FROM <%= table %><%= where %>';
} }
var pks; var pks = _.map(_.values(model.primaryKeys), function (pk) {
if (primaryKeys[tableName] && primaryKeys[tableName].length > 0) { return this.quoteIdentifier((pk.field));
pks = primaryKeys[tableName].map(function(pk) { }.bind(this)).join(',');
return this.quoteIdentifier(pk);
}.bind(this)).join(',');
} else {
pks = this.quoteIdentifier('id');
}
var replacements = { var replacements = {
table: this.quoteIdentifiers(tableName), table: tableName,
where: this.getWhereConditions(where, null, model, options), where: this.getWhereConditions(where, null, model, options),
limit: !!options.limit ? ' LIMIT ' + this.escape(options.limit) : '', limit: !!options.limit ? ' LIMIT ' + this.escape(options.limit) : '',
primaryKeys: primaryKeys[tableName].length > 1 ? '(' + pks + ')' : pks, primaryKeys: model.primaryKeyAttributes.length > 1 ? '(' + pks + ')' : pks,
primaryKeysSelection: pks primaryKeysSelection: pks
}; };
...@@ -818,13 +805,8 @@ var QueryGenerator = { ...@@ -818,13 +805,8 @@ var QueryGenerator = {
return (i < 10) ? '0' + i.toString() : i.toString(); return (i < 10) ? '0' + i.toString() : i.toString();
}, },
pgDataTypeMapping: function(tableName, attr, dataType) {
return this.dataTypeMapping(tableName, attr, dataType);
},
dataTypeMapping: function(tableName, attr, dataType) { dataTypeMapping: function(tableName, attr, dataType) {
if (Utils._.includes(dataType, 'PRIMARY KEY')) { if (Utils._.includes(dataType, 'PRIMARY KEY')) {
primaryKeys[tableName].push(attr);
dataType = dataType.replace(/PRIMARY KEY/, ''); dataType = dataType.replace(/PRIMARY KEY/, '');
} }
......
test/unit/dialects/mysql/query-generator.test.js
...@@ -509,31 +509,6 @@ if (Support.dialectIsMySQL()) { ...@@ -509,31 +509,6 @@ if (Support.dialectIsMySQL()) {
} }
], ],
deleteQuery: [
{
arguments: ['myTable', {name: 'foo'}],
expectation: "DELETE FROM `myTable` WHERE `name` = 'foo' LIMIT 1"
}, {
arguments: ['myTable', 1],
expectation: 'DELETE FROM `myTable` WHERE `id` = 1 LIMIT 1'
},{
arguments: ['myTable', undefined, {truncate: true}],
expectation: 'TRUNCATE `myTable`'
},{
arguments: ['myTable', 1, {limit: 10, truncate: true}],
expectation: 'TRUNCATE `myTable`'
}, {
arguments: ['myTable', 1, {limit: 10}],
expectation: 'DELETE FROM `myTable` WHERE `id` = 1 LIMIT 10'
}, {
arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}],
expectation: "DELETE FROM `myTable` WHERE `name` = 'foo\\';DROP TABLE myTable;' LIMIT 10"
}, {
arguments: ['myTable', {name: 'foo'}, {limit: null}],
expectation: "DELETE FROM `myTable` WHERE `name` = 'foo'"
}
],
showIndexesQuery: [ showIndexesQuery: [
{ {
arguments: ['User'], arguments: ['User'],
......
test/unit/dialects/postgres/query-generator.test.js
...@@ -826,71 +826,6 @@ if (dialect.match(/^postgres/)) { ...@@ -826,71 +826,6 @@ if (dialect.match(/^postgres/)) {
} }
], ],
deleteQuery: [
{
arguments: ['myTable', {name: 'foo'}],
expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\" = 'foo' LIMIT 1)"
}, {
arguments: ['myTable', 1],
expectation: 'DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"id\" = 1 LIMIT 1)'
}, {
arguments: ['myTable', undefined, {truncate: true}],
expectation: 'TRUNCATE \"myTable\"'
}, {
arguments: ['myTable', undefined, {truncate: true, cascade: true}],
expectation: 'TRUNCATE \"myTable\" CASCADE'
}, {
arguments: ['myTable', 1, {limit: 10, truncate: true}],
expectation: 'TRUNCATE \"myTable\"'
}, {
arguments: ['myTable', 1, {limit: 10}],
expectation: 'DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"id\" = 1 LIMIT 10)'
}, {
arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}],
expectation: "DELETE FROM \"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"myTable\" WHERE \"name\" = 'foo'';DROP TABLE myTable;' LIMIT 10)"
}, {
arguments: ['mySchema.myTable', {name: 'foo'}],
expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\" = 'foo' LIMIT 1)"
}, {
arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}, {limit: 10}],
expectation: "DELETE FROM \"mySchema\".\"myTable\" WHERE \"id\" IN (SELECT \"id\" FROM \"mySchema\".\"myTable\" WHERE \"name\" = 'foo'';DROP TABLE mySchema.myTable;' LIMIT 10)"
}, {
arguments: ['myTable', {name: 'foo'}, {limit: null}],
expectation: "DELETE FROM \"myTable\" WHERE \"name\" = 'foo'"
},
// Variants when quoteIdentifiers is false
{
arguments: ['myTable', {name: 'foo'}],
expectation: "DELETE FROM myTable WHERE id IN (SELECT id FROM myTable WHERE name = 'foo' LIMIT 1)",
context: {options: {quoteIdentifiers: false}}
}, {
arguments: ['myTable', 1],
expectation: 'DELETE FROM myTable WHERE id IN (SELECT id FROM myTable WHERE id = 1 LIMIT 1)',
context: {options: {quoteIdentifiers: false}}
}, {
arguments: ['myTable', 1, {limit: 10}],
expectation: 'DELETE FROM myTable WHERE id IN (SELECT id FROM myTable WHERE id = 1 LIMIT 10)',
context: {options: {quoteIdentifiers: false}}
}, {
arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}],
expectation: "DELETE FROM myTable WHERE id IN (SELECT id FROM myTable WHERE name = 'foo'';DROP TABLE myTable;' LIMIT 10)",
context: {options: {quoteIdentifiers: false}}
}, {
arguments: ['mySchema.myTable', {name: 'foo'}],
expectation: "DELETE FROM mySchema.myTable WHERE id IN (SELECT id FROM mySchema.myTable WHERE name = 'foo' LIMIT 1)",
context: {options: {quoteIdentifiers: false}}
}, {
arguments: ['mySchema.myTable', {name: "foo';DROP TABLE mySchema.myTable;"}, {limit: 10}],
expectation: "DELETE FROM mySchema.myTable WHERE id IN (SELECT id FROM mySchema.myTable WHERE name = 'foo'';DROP TABLE mySchema.myTable;' LIMIT 10)",
context: {options: {quoteIdentifiers: false}}
}, {
arguments: ['myTable', {name: 'foo'}, {limit: null}],
expectation: "DELETE FROM myTable WHERE name = 'foo'",
context: {options: {quoteIdentifiers: false}}
}
],
removeIndexQuery: [ removeIndexQuery: [
{ {
arguments: ['User', 'user_foo_bar'], arguments: ['User', 'user_foo_bar'],
......
test/unit/dialects/sqlite/query-generator.test.js
...@@ -497,28 +497,6 @@ if (dialect === 'sqlite') { ...@@ -497,28 +497,6 @@ if (dialect === 'sqlite') {
expectation: "UPDATE `myTable` SET `bar`=`foo` WHERE `name` = 'foo'", expectation: "UPDATE `myTable` SET `bar`=`foo` WHERE `name` = 'foo'",
needsSequelize: true needsSequelize: true
} }
],
deleteQuery: [
{
arguments: ['myTable', {name: 'foo'}],
expectation: "DELETE FROM `myTable` WHERE `name` = 'foo'"
}, {
arguments: ['myTable', 1],
expectation: 'DELETE FROM `myTable` WHERE `id` = 1'
}, {
arguments: ['myTable', 1, {truncate: true}],
expectation: 'DELETE FROM `myTable` WHERE `id` = 1'
}, {
arguments: ['myTable', 1, {limit: 10}],
expectation: 'DELETE FROM `myTable` WHERE `id` = 1'
}, {
arguments: ['myTable', {name: "foo';DROP TABLE myTable;"}, {limit: 10}],
expectation: "DELETE FROM `myTable` WHERE `name` = 'foo'';DROP TABLE myTable;'"
}, {
arguments: ['myTable', {name: 'foo'}, {limit: null}],
expectation: "DELETE FROM `myTable` WHERE `name` = 'foo'"
}
] ]
}; };
......
test/unit/sql/delete.test.js
...@@ -12,16 +12,95 @@ var Support = require(__dirname + '/../support') ...@@ -12,16 +12,95 @@ var Support = require(__dirname + '/../support')
suite(Support.getTestDialectTeaser('SQL'), function() { suite(Support.getTestDialectTeaser('SQL'), function() {
suite('delete', function () { suite('delete', function () {
var User = current.define('test_user', {}, {
timestamps:false,
schema: 'public'
});
suite('delete when the primary key has a different field name', function () { suite('truncate #4306', function () {
var options = {
table: User.getTableName(),
where: {},
truncate: true,
cascade: true,
limit: 10
};
test(util.inspect(options, {depth: 2}), function () {
return expectsql(
sql.deleteQuery(
options.table,
options.where,
options,
User
), {
postgres: 'TRUNCATE "public"."test_users" CASCADE',
mssql: "TRUNCATE TABLE [public].[test_users]",
mysql: 'TRUNCATE `public.test_users`',
sqlite: 'DELETE FROM `public.test_users`'
}
);
});
});
suite('delete without limit', function () {
var options = {
table: User.getTableName(),
where: {name: 'foo' },
limit: null
};
test(util.inspect(options, {depth: 2}), function () {
return expectsql(
sql.deleteQuery(
options.table,
options.where,
options,
User
), {
default: "DELETE FROM [public.test_users] WHERE `name` = 'foo'",
postgres: 'DELETE FROM "public"."test_users" WHERE "name" = \'foo\'',
mssql: "DELETE FROM [public].[test_users] WHERE [name] = N'foo'; SELECT @@ROWCOUNT AS AFFECTEDROWS;"
}
);
});
});
suite('delete with limit', function () {
var options = {
table: User.getTableName(),
where: {name: "foo';DROP TABLE mySchema.myTable;"},
limit: 10
};
test(util.inspect(options, {depth: 2}), function () {
return expectsql(
sql.deleteQuery(
options.table,
options.where,
options,
User
), {
postgres: 'DELETE FROM "public"."test_users" WHERE "id" IN (SELECT "id" FROM "public"."test_users" WHERE "name" = \'foo\'\';DROP TABLE mySchema.myTable;\' LIMIT 10)',
sqlite: "DELETE FROM `public.test_users` WHERE `name` = 'foo'';DROP TABLE mySchema.myTable;'",
mssql: "DELETE TOP(10) FROM [public].[test_users] WHERE [name] = N'foo'';DROP TABLE mySchema.myTable;'; SELECT @@ROWCOUNT AS AFFECTEDROWS;",
default: "DELETE FROM [public.test_users] WHERE `name` = 'foo\\';DROP TABLE mySchema.myTable;' LIMIT 10"
}
);
});
});
suite('delete when the primary key has a different field name', function () {
var User = current.define('test_user', { var User = current.define('test_user', {
id: { id: {
type: Sequelize.INTEGER, type: Sequelize.INTEGER,
primaryKey: true, primaryKey: true,
field: "test_user_id", field: "test_user_id"
} }
}, { freezeTableName: true, timestamps:false }); }, {
timestamps:false,
schema: 'public'
});
var options = { var options = {
table: 'test_user', table: 'test_user',
...@@ -43,7 +122,6 @@ suite(Support.getTestDialectTeaser('SQL'), function() { ...@@ -43,7 +122,6 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
} }
); );
}); });
}); });
}); });
}); });
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!