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

Commit feb41513 by Daniel Durante

Fixed console.log options for postgres.

1 parent 1e343008
...@@ -1021,7 +1021,7 @@ module.exports = (function() { ...@@ -1021,7 +1021,7 @@ module.exports = (function() {
} }
DAOFactory.prototype.__setSqlDialect = function() { DAOFactory.prototype.__setSqlDialect = function() {
var dialect = this.daoFactoryManager.sequelize.options.dialect var dialect = this.daoFactoryManager.sequelize.options.dialect
this.__sql = sql.setDialect(dialect === 'mariadb' ? 'mysql' : dialect) this.__sql = sql.setDialect(dialect === 'mariadb' ? 'mysql' : dialect)
} }
......
...@@ -153,4 +153,4 @@ module.exports = (function() { ...@@ -153,4 +153,4 @@ module.exports = (function() {
} }
return ConnectorManager return ConnectorManager
})() })()
\ No newline at end of file
...@@ -162,4 +162,4 @@ module.exports = (function() { ...@@ -162,4 +162,4 @@ module.exports = (function() {
} }
return Query return Query
})() })()
\ No newline at end of file
...@@ -111,7 +111,7 @@ module.exports = (function() { ...@@ -111,7 +111,7 @@ module.exports = (function() {
// If the enum type doesn't exist then create it // If the enum type doesn't exist then create it
if (!results[enumIdx]) { if (!results[enumIdx]) {
sql = self.QueryGenerator.pgEnum(getTableName, keys[i], attributes[keys[i]], options) sql = self.QueryGenerator.pgEnum(getTableName, keys[i], attributes[keys[i]], options)
chainer2.add(self.sequelize.query(sql, null, { raw: true })) chainer2.add(self.sequelize.query(sql, null, { raw: true, logging: options.logging }))
} }
else if (!!results[enumIdx] && !!daoTable) { else if (!!results[enumIdx] && !!daoTable) {
var enumVals = self.QueryGenerator.fromArray(results[enumIdx].enum_value) var enumVals = self.QueryGenerator.fromArray(results[enumIdx].enum_value)
...@@ -141,7 +141,7 @@ module.exports = (function() { ...@@ -141,7 +141,7 @@ module.exports = (function() {
sql = self.QueryGenerator.createTableQuery(tableName, attributes, options) sql = self.QueryGenerator.createTableQuery(tableName, attributes, options)
chainer2.run().success(function() { chainer2.run().success(function() {
queryAndEmit.call(self, sql, 'createTable') queryAndEmit.call(self, sql, 'createTable', options)
.success(function(res) { .success(function(res) {
self.emit('createTable', null) self.emit('createTable', null)
emitter.emit('success', res) emitter.emit('success', res)
...@@ -150,7 +150,9 @@ module.exports = (function() { ...@@ -150,7 +150,9 @@ module.exports = (function() {
self.emit('createTable', err) self.emit('createTable', err)
emitter.emit('error', err) emitter.emit('error', err)
}) })
.on('sql', function(sql) { emitter.emit('sql', sql) }) .on('sql', function(sql) {
emitter.emit('sql', sql)
})
}).error(function(err) { }).error(function(err) {
emitter.emit('error', err) emitter.emit('error', err)
}).on('sql', function(sql) { }).on('sql', function(sql) {
...@@ -161,8 +163,7 @@ module.exports = (function() { ...@@ -161,8 +163,7 @@ module.exports = (function() {
attributes = self.QueryGenerator.attributesToSQL(attributeHashes) attributes = self.QueryGenerator.attributesToSQL(attributeHashes)
sql = self.QueryGenerator.createTableQuery(tableName, attributes, options) sql = self.QueryGenerator.createTableQuery(tableName, attributes, options)
emitter.logging = options.logging queryAndEmit.call(self, sql, 'createTable', options).success(function(results) {
queryAndEmit.call(self, sql, 'createTable', emitter).success(function(results) {
self.emit('createTable', null) self.emit('createTable', null)
emitter.emit('success', results) emitter.emit('success', results)
}).error(function(err) { }).error(function(err) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!