Skip to content

Commit

Permalink
Removed Seriate and put in NODE MSSQL
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Trost authored and Matt Broadstone committed Dec 9, 2014
1 parent 6acb13d commit 0116710
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 30 deletions.
37 changes: 24 additions & 13 deletions lib/dialects/mssql/connection-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ConnectionManager = function(dialect, sequelize) {
this.sequelize.config.port = this.sequelize.config.port || 1433;

try {
this.lib = require(sequelize.config.dialectModulePath || 'seriate');
this.lib = require(sequelize.config.dialectModulePath || 'mssql');
} catch (err) {
throw new Error('Please install seriate package manually');
}
Expand All @@ -37,19 +37,30 @@ ConnectionManager.prototype.connect = function(config) {
connectionConfig[key] = config.dialectOptions[key];
});
}

var connection = {
config: {
user: connectionConfig.user,
password: connectionConfig.password,
server: connectionConfig.host,
database: connectionConfig.database
},

lib: self.lib
config = {
user: connectionConfig.user,
password: connectionConfig.password,
server: connectionConfig.host,
database: connectionConfig.database
};

resolve(connection);
self.lib.connect(config, function(err) {
// var request = new self.lib.Request();
// request.query('select 1 as number', function(err, recordset) {
// console.log('err2', err);
// console.log(recordset);
// });
});
// var connection = {
// config: {
// user: connectionConfig.user,
// password: connectionConfig.password,
// server: connectionConfig.host,
// database: connectionConfig.database
// },
// };
//connection = self.lib;
// connection.lib = self.lib.getPlainContext(connection.config);
resolve(self.lib);
});
};
ConnectionManager.prototype.disconnect = function(connection) {
Expand Down
3 changes: 2 additions & 1 deletion lib/dialects/mssql/query-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,8 @@ module.exports = (function() {
*/
startTransactionQuery: function(transaction, options) {
if (options.parent) {
return 'SAVE TRANSACTION ' + this.quoteIdentifier(transaction.name) + ';';
return '';
//return 'SAVE TRANSACTION ' + SqlGenerator.quoteIdentifier(transaction.name) + ';';
}

return 'BEGIN TRANSACTION';
Expand Down
40 changes: 24 additions & 16 deletions lib/dialects/mssql/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,31 @@ module.exports = (function() {
var promise = new Utils.Promise(function(resolve, reject) {
console.log(self.sql);

self
.connection
.lib
.execute(self.connection.config, { query: self.sql })
.then(
function (data) {
promise.emit('sql', self.sql, self.connection.uuid);
resolve(self.formatResults(data.result));
},
function (err) {
console.log('err:', err);
err.sql = sql;
reject(self.formatError(err));
}
);
// self
// .connection
// .lib
// .step('',{ query: self.sql })
// .error(function (err) {
// console.log('err:', err);
// err.sql = sql;
// reject(self.formatError(err));
// })
// .end(function (result) {
// console.log('res', result.query);
// resolve(self.formatResults(result.query));
// });
// });
var request = new self.connection.Request();

request.query(self.sql, function(err, recordset) {
promise.emit('sql', self.sql, self.connection.uuid);
if(err){
console.log(err.message);
reject(self.formatError(err));
}
resolve(self.formatResults(recordset));
});
});

return promise;
};

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"sqlite3": "~3.0.0",
"mysql": "~2.5.0",
"pg": "~3.6.0",
"mssql": "^1.2.0",
"watchr": "~2.4.11",
"chai": "~1.9.2",
"mocha": "~2.0.0",
Expand Down

0 comments on commit 0116710

Please sign in to comment.