yujunjun/knex
1
0
Fork 0
mirror of https://github.com/knex/knex.git synced 2025-12-27 15:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

oracle - fixed non-supported options

Browse Source
This commit is contained in:
Vincent Schoettke 2014-08-27 10:10:20 +02:00
parent 02eb8cbe5e
commit d0b8c717e4
2 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dialects/oracle/query.js
View File

@ -6,6 +6,7 @@ var _ = require('lodash');
var inherits = require('inherits');
var QueryBuilder = require('../../query/builder');
var QueryCompiler = require('../../query/compiler');
var helpers = require('../../helpers');
var ReturningHelper = require('./utils').ReturningHelper;
@ -62,7 +63,7 @@ QueryCompiler_Oracle.prototype.insert = function() {
returning = [returning];
}
if (_.isEmpty(self.single.insert)) {
if (_.isEmpty(self.single.insert) && !_.isFunction(this.single.insert)) {
return self._addReturningToSqlAndConvert('insert into ' + self.tableName + ' (' + self.formatter.wrap(self.single.returning) + ') values (default)', returning, self.tableName);
}
@ -110,17 +111,11 @@ QueryCompiler_Oracle.prototype.insert = function() {
// Update method, including joins, wheres, order & limits.
QueryCompiler_Oracle.prototype.update = function() {
var join = this.join();
var updates = this._prepUpdate(this.single.update);
var where = this.where();
var order = this.order();
var limit = this.limit();
return 'update ' + this.tableName +
(join ? ' ' + join : '') +
' set ' + updates.join(', ') +
(where ? ' ' + where : '') +
(order ? ' ' + order : '') +
(limit ? ' ' + limit : '');
(where ? ' ' + where : '');
};
// Compiles a `truncate` query.
@ -132,7 +127,10 @@ QueryCompiler_Oracle.prototype.forUpdate = function() {
return 'for update';
};
QueryCompiler_Oracle.prototype.forShare = function() {
return 'lock in share mode';
// lock for share is not directly supported by oracle
// use LOCK TABLE .. IN SHARE MODE; instead
helpers.warn('lock for share is not supported by oracle dialect');
return '';
};
// Compiles a `columnInfo` query.

36
test/unit/query/builder.js
View File

@ -1190,10 +1190,6 @@ module.exports = function(qb, clientName, aliasName) {
sql: 'update `users` set `email` = ?, `name` = ? where `id` = ? order by `foo` desc limit ?',
bindings: ['foo', 'bar', 1, 5]
},
oracle: {
sql: 'update "users" set "email" = ?, "name" = ? where "id" = ? order by "foo" desc', // TODO: This is wrong
bindings: ['foo', 'bar', 1]
},
default: {
sql: 'update "users" set "email" = ?, "name" = ? where "id" = ?',
bindings: ['foo', 'bar', 1]
@ -1211,10 +1207,6 @@ module.exports = function(qb, clientName, aliasName) {
sql: 'update "users" inner join "orders" on "users"."id" = "orders"."user_id" set "email" = ?, "name" = ? where "users"."id" = ?',
bindings: ['foo', 'bar', 1]
},
oracle: { // TODO: This is wrong
sql: 'update "users" inner join "orders" on "users"."id" = "orders"."user_id" set "email" = ?, "name" = ? where "users"."id" = ?',
bindings: ['foo', 'bar', 1]
},
default: {
sql: "update \"users\" set \"email\" = ?, \"name\" = ? where \"users\".\"id\" = ?",
bindings: ['foo', 'bar', 1]
@ -1405,11 +1397,6 @@ module.exports = function(qb, clientName, aliasName) {
sql: "select * from \"foo\" where \"bar\" = ? for share",
bindings: ['baz']
},
oracle: {
// TODO: This is wrong/not possible
sql: "select * from \"foo\" where \"bar\" = ? lock in share mode",
bindings: ['baz']
},
default: {
sql: 'select * from "foo" where "bar" = ?',
bindings: ['baz']
@ -1563,18 +1550,13 @@ module.exports = function(qb, clientName, aliasName) {
sql: 'update `tblPerson` inner join `tblPersonData` on `tblPersonData`.`PersonId` = `tblPerson`.`PersonId` set `tblPerson`.`City` = ? where `tblPersonData`.`DataId` = ? and `tblPerson`.`PersonId` = ?',
bindings: ['Boonesville', 1, 5]
},
postgres: {
sql: 'update "tblPerson" set "tblPerson"."City" = ? where "tblPersonData"."DataId" = ? and "tblPerson"."PersonId" = ?',
bindings: ['Boonesville', 1, 5]
},
sqlite3: {
// TODO: THIS IS NOT WORKING
sql: 'update "tblPerson" inner join "tblPersonData" on "tblPersonData"."PersonId" = "tblPerson"."PersonId" set "tblPerson"."City" = ? where "tblPersonData"."DataId" = ? and "tblPerson"."PersonId" = ?',
bindings: ['Boonesville', 1, 5]
},
oracle: {
// TODO: THIS IS NOT WORKING
sql: 'update "tblPerson" inner join "tblPersonData" on "tblPersonData"."PersonId" = "tblPerson"."PersonId" set "tblPerson"."City" = ? where "tblPersonData"."DataId" = ? and "tblPerson"."PersonId" = ?',
default: {
sql: 'update "tblPerson" set "tblPerson"."City" = ? where "tblPersonData"."DataId" = ? and "tblPerson"."PersonId" = ?',
bindings: ['Boonesville', 1, 5]
}
});
@ -1698,7 +1680,7 @@ module.exports = function(qb, clientName, aliasName) {
default: {
sql: 'select "e"."lastname", "e"."salary", (select "avg(salary)" from "employee" where dept_no = e.dept_no) as "avg_sal_dept" from "employee" as "e" where "dept_no" = ?',
bindings: ["e.dept_no"]
}
}
});
});
@ -1722,7 +1704,7 @@ module.exports = function(qb, clientName, aliasName) {
default: {
sql: 'select "e"."lastname", "e"."salary", (select "avg(salary)" from "employee" where dept_no = e.dept_no) as "avg_sal_dept" from "employee" as "e" where "dept_no" = ?',
bindings: ["e.dept_no"]
}
}
});
});
@ -1788,15 +1770,10 @@ module.exports = function(qb, clientName, aliasName) {
sql: 'insert into `votes` select * from `votes` where `id` = ?',
bindings: [99]
},
oracle: {
// TODO: THIS IS WRONG
sql: "insert into \"votes\" (\"undefined\") values (default)",
bindings: []
},
sqlite3: {
// TODO: THIS IS MAYBE WRONG
sql: "insert into \"votes\" default values",
bindings: []
bindings: []
},
default: {
sql: 'insert into "votes" select * from "votes" where "id" = ?',
@ -1818,7 +1795,6 @@ module.exports = function(qb, clientName, aliasName) {
bindings: [99]
},
oracle: {
// TODO: Check if possible
sql: 'insert into "votes" select * from "votes" where "id" = ?',
bindings: [99]
},
@ -1826,7 +1802,7 @@ module.exports = function(qb, clientName, aliasName) {
sql: 'insert into "votes" select * from "votes" where "id" = ?',
bindings: [99]
}
});
});
});
});