Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve oracle bulk inserts #388

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve oracle bulk inserts #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a6f13c
Improve oracle bulk inserts
Feb 7, 2018
980f593
Change mocha version to support old node versions
Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion lib/dialect/oracle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,40 @@ Oracle.prototype.visitRestrict = function() {
throw new Error('Oracle do not support RESTRICT in DROP TABLE');
};

Oracle.prototype.visitInsert = function(insert) {
var paramNodes = insert.getParameters();

if (paramNodes.length <= 1) {
return Oracle.super_.prototype.visitInsert.call(this, insert);
} else {
var self = this;

this._visitedInsert = true;

var result = ['INSERT ALL'];

result.push(paramNodes.map(function (paramSet) {
var paramResult = [];
paramResult.push('INTO ' + self.visit(self._queryNode.table.toNode()));
paramResult.push('(' + insert.columns.map(self.visit.bind(self)).join(', ') + ')');

paramResult.push('VALUES');

paramResult.push('(' + paramSet.map(function (param) {
return self.visit(param);
}).join(', ') + ')');

return paramResult.join(' ');
}).join(' '));

result.push('SELECT * FROM dual');

this._visitedInsert = true;

return result;
}
};

Oracle.prototype.visitDrop = function(drop) {
if (!isDropIfExists(drop)) {
return Oracle.super_.prototype.visitDrop.call(this, drop);
Expand Down Expand Up @@ -202,7 +236,7 @@ Oracle.prototype.visitQueryHelper=function(actions,targets,filters){
};

Oracle.prototype.visitColumn = function(columnNode) {
var self=this;
var self = this;
var table;
var inSelectClause;

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
},
"devDependencies": {
"jshint": "*",
"mocha": "*"
"mocha": "3.5.x"
}
}
26 changes: 13 additions & 13 deletions test/dialects/insert-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ Harness.test({
string: 'INSERT INTO `post` (`content`) VALUES (\'whoah\'), (\'hey\')'
},
oracle: {
text : 'INSERT INTO "post" ("content") VALUES (:1), (:2)',
string: 'INSERT INTO "post" ("content") VALUES (\'whoah\'), (\'hey\')'
text : 'INSERT ALL INTO "post" ("content") VALUES (:1) INTO "post" ("content") VALUES (:2) SELECT * FROM dual',
string: 'INSERT ALL INTO "post" ("content") VALUES (\'whoah\') INTO "post" ("content") VALUES (\'hey\') SELECT * FROM dual',
},
params: ['whoah', 'hey']
});
Expand All @@ -179,8 +179,8 @@ Harness.test({
string: 'INSERT INTO `post` (`content`, `userId`) VALUES (\'whoah\', 1), (\'hey\', 2)'
},
oracle: {
text : 'INSERT INTO "post" ("content", "userId") VALUES (:1, :2), (:3, :4)',
string: 'INSERT INTO "post" ("content", "userId") VALUES (\'whoah\', 1), (\'hey\', 2)'
text : 'INSERT ALL INTO "post" ("content", "userId") VALUES (:1, :2) INTO "post" ("content", "userId") VALUES (:3, :4) SELECT * FROM dual',
string: 'INSERT ALL INTO "post" ("content", "userId") VALUES (\'whoah\', 1) INTO "post" ("content", "userId") VALUES (\'hey\', 2) SELECT * FROM dual',
},
params: ['whoah', 1, 'hey', 2]
});
Expand Down Expand Up @@ -212,8 +212,8 @@ Harness.test({
string: 'INSERT INTO [post] ([content], [userId]) VALUES (\'whoah\', 1), (\'hey\', 2)'
},
oracle: {
text : 'INSERT INTO "post" ("content", "userId") VALUES (:1, :2), (:3, :4)',
string: 'INSERT INTO "post" ("content", "userId") VALUES (\'whoah\', 1), (\'hey\', 2)'
text : 'INSERT ALL INTO "post" ("content", "userId") VALUES (:1, :2) INTO "post" ("content", "userId") VALUES (:3, :4) SELECT * FROM dual',
string: 'INSERT ALL INTO "post" ("content", "userId") VALUES (\'whoah\', 1) INTO "post" ("content", "userId") VALUES (\'hey\', 2) SELECT * FROM dual',
},
params: ['whoah', 1, 'hey', 2]
});
Expand Down Expand Up @@ -377,8 +377,8 @@ Harness.test({
params: ['whoah', 1, 'hey']
},
oracle: {
text : 'INSERT INTO "post" ("content", "userId") VALUES (:1, :2), (:3, DEFAULT)',
string: 'INSERT INTO "post" ("content", "userId") VALUES (\'whoah\', 1), (\'hey\', DEFAULT)',
text : 'INSERT ALL INTO "post" ("content", "userId") VALUES (:1, :2) INTO "post" ("content", "userId") VALUES (:3, DEFAULT) SELECT * FROM dual',
string: 'INSERT ALL INTO "post" ("content", "userId") VALUES (\'whoah\', 1) INTO "post" ("content", "userId") VALUES (\'hey\', DEFAULT) SELECT * FROM dual',
params: ['whoah', 1, 'hey']
},
});
Expand Down Expand Up @@ -411,10 +411,10 @@ Harness.test({
params: [1, 2, 'hey']
},
oracle: {
text : 'INSERT INTO "post" ("userId", "content") VALUES (:1, DEFAULT), (:2, :3)',
string: 'INSERT INTO "post" ("userId", "content") VALUES (1, DEFAULT), (2, \'hey\')',
text : 'INSERT ALL INTO "post" ("userId", "content") VALUES (:1, DEFAULT) INTO "post" ("userId", "content") VALUES (:2, :3) SELECT * FROM dual',
string: 'INSERT ALL INTO "post" ("userId", "content") VALUES (1, DEFAULT) INTO "post" ("userId", "content") VALUES (2, \'hey\') SELECT * FROM dual',
params: [1, 2, 'hey']
}
},
});

Harness.test({
Expand Down Expand Up @@ -621,8 +621,8 @@ Harness.test({
string: 'INSERT INTO [post] ([content]) VALUES (\'\\x77686f6168\'), (\'\\x686579\')'
},
oracle: {
text : 'INSERT INTO "post" ("content") VALUES (:1), (:2)',
string: 'INSERT INTO "post" ("content") VALUES (utl_raw.cast_to_varchar2(hextoraw(\'77686f6168\'))), (utl_raw.cast_to_varchar2(hextoraw(\'686579\')))'
text : 'INSERT ALL INTO "post" ("content") VALUES (:1) INTO "post" ("content") VALUES (:2) SELECT * FROM dual',
string: 'INSERT ALL INTO "post" ("content") VALUES (utl_raw.cast_to_varchar2(hextoraw(\'77686f6168\'))) INTO "post" ("content") VALUES (utl_raw.cast_to_varchar2(hextoraw(\'686579\'))) SELECT * FROM dual',
},
params: [new Buffer('whoah'), new Buffer('hey')]
});
Expand Down