caminte - npm Package Compare versions
Comparing version 0.2.16 to 0.2.17
| /** | ||
| * Module dependencies | ||
| */ | ||
| var utils = require('../utils'); | ||
| var util = require('util'); | ||
| var utils = require( '../utils' ); | ||
| var util = require( 'util' ); | ||
| var safeRequire = utils.safeRequire; | ||
| var mysql = safeRequire('mysql'); | ||
| var BaseSQL = require('../sql'); | ||
| var mysql = safeRequire( 'mysql' ); | ||
| var BaseSQL = require( '../sql' ); | ||
| exports.initialize = function initializeSchema(schema, callback) { | ||
| 'use strict'; | ||
| if (!mysql) { | ||
| if ( !mysql ) { | ||
| return; | ||
@@ -27,3 +27,3 @@ } | ||
| if (s.pool) { | ||
| if ( s.pool ) { | ||
@@ -34,63 +34,62 @@ conSettings.connectionLimit = s.connectionLimit || 10; | ||
| schema.client = mysql.createPool(conSettings); | ||
| schema.client.getConnection(function (err, connection) { | ||
| if (err) { | ||
| throw new Error(err); | ||
| schema.client = mysql.createPool( conSettings ); | ||
| schema.client.getConnection( function (err, connection) { | ||
| if ( err ) { | ||
| throw new Error( err ); | ||
| } | ||
| }); | ||
| schema.adapter = new MySQL(schema.client, conSettings); | ||
| } ); | ||
| schema.adapter = new MySQL( schema.client, conSettings ); | ||
| schema.adapter.schema = schema; | ||
| schema.client.once('connection', function (connection) { | ||
| if (s.autoReconnect) { | ||
| setInterval(function () { | ||
| schema.client.query('SELECT 1+1', function (err, data) { | ||
| schema.client.once( 'connection', function (connection) { | ||
| if ( s.autoReconnect ) { | ||
| setInterval( function () { | ||
| schema.client.query( 'SELECT 1+1', function (err, data) { | ||
| // | ||
| }); | ||
| }, conSettings.acquireTimeout); | ||
| } ); | ||
| }, conSettings.acquireTimeout ); | ||
| } | ||
| startAdapter(schema, dbName, callback); | ||
| }); | ||
| startAdapter( schema, dbName, callback ); | ||
| } ); | ||
| } else { | ||
| schema.client = mysql.createConnection(conSettings); | ||
| schema.adapter = new MySQL(schema.client, conSettings); | ||
| schema.client = mysql.createConnection( conSettings ); | ||
| schema.adapter = new MySQL( schema.client, conSettings ); | ||
| schema.adapter.schema = schema; | ||
| if (s.autoReconnect) { | ||
| setInterval(function () { | ||
| schema.client.query('SELECT 1+1', function (err, data) { | ||
| if ( s.autoReconnect ) { | ||
| setInterval( function () { | ||
| schema.client.query( 'SELECT 1+1', function (err, data) { | ||
| // | ||
| }); | ||
| }, conSettings.acquireTimeout); | ||
| } ); | ||
| }, conSettings.acquireTimeout ); | ||
| } | ||
| startAdapter(schema, dbName, callback); | ||
| startAdapter( schema, dbName, callback ); | ||
| } | ||
| function handleDisconnect(client) { | ||
| 'use strict'; | ||
| schema.client.on('error', function (error) { | ||
| if (error.code !== 'PROTOCOL_CONNECTION_LOST') throw error; | ||
| console.log("> Re-connecting lost MySQL connection: " + error.stack); | ||
| if (s.pool) { | ||
| schema.client = mysql.createPool(conSettings); | ||
| schema.client.getConnection(function (err, connection) { | ||
| if (err) { | ||
| throw new Error(err); | ||
| schema.client.on( 'error', function (error) { | ||
| if ( error.code !== 'PROTOCOL_CONNECTION_LOST' ) throw error; | ||
| console.log( "> Re-connecting lost MySQL connection: " + error.stack ); | ||
| if ( s.pool ) { | ||
| schema.client = mysql.createPool( conSettings ); | ||
| schema.client.getConnection( function (err, connection) { | ||
| if ( err ) { | ||
| throw new Error( err ); | ||
| } | ||
| }); | ||
| schema.adapter = new MySQL(schema.client, conSettings); | ||
| } ); | ||
| schema.adapter = new MySQL( schema.client, conSettings ); | ||
| schema.adapter.schema = schema; | ||
| schema.client.once('connection', function (connection) { | ||
| startAdapter(schema, dbName, callback); | ||
| }); | ||
| handleDisconnect(schema.client); | ||
| schema.client.once( 'connection', function (connection) { | ||
| startAdapter( schema, dbName, callback ); | ||
| } ); | ||
| handleDisconnect( schema.client ); | ||
| } else { | ||
| schema.client = mysql.createConnection(conSettings); | ||
| schema.adapter = new MySQL(schema.client, conSettings); | ||
| schema.client = mysql.createConnection( conSettings ); | ||
| schema.adapter = new MySQL( schema.client, conSettings ); | ||
| schema.adapter.schema = schema; | ||
| startAdapter(schema, dbName, callback); | ||
| handleDisconnect(schema.client); | ||
| startAdapter( schema, dbName, callback ); | ||
| handleDisconnect( schema.client ); | ||
| } | ||
| }); | ||
| } ); | ||
| } | ||
| handleDisconnect(schema.client); | ||
| handleDisconnect( schema.client ); | ||
| }; | ||
@@ -100,15 +99,15 @@ | ||
| 'use strict'; | ||
| schema.client.query('USE `' + dbName + '`', function (err) { | ||
| if (err && err.message.match(/unknown database/i)) { | ||
| schema.client.query('CREATE DATABASE ' + dbName, function (error) { | ||
| if (!error) { | ||
| schema.client.query('USE ' + dbName, callback); | ||
| schema.client.query( 'USE `' + dbName + '`', function (err) { | ||
| if ( err && err.message.match( /unknown database/i ) ) { | ||
| schema.client.query( 'CREATE DATABASE ' + dbName, function (error) { | ||
| if ( !error ) { | ||
| schema.client.query( 'USE ' + dbName, callback ); | ||
| } else { | ||
| throw error; | ||
| } | ||
| }); | ||
| } ); | ||
| } else { | ||
| callback(); | ||
| } | ||
| }); | ||
| } ); | ||
| } | ||
@@ -130,3 +129,3 @@ | ||
| util.inherits(MySQL, BaseSQL); | ||
| util.inherits( MySQL, BaseSQL ); | ||
@@ -138,30 +137,30 @@ MySQL.prototype.query = function (sql, callback) { | ||
| var log = self.log || console.log; | ||
| if (typeof callback !== 'function') { | ||
| throw new Error('callback should be a function'); | ||
| if ( typeof callback !== 'function' ) { | ||
| throw new Error( 'callback should be a function' ); | ||
| } | ||
| client.query(sql, function (err, data) { | ||
| if (log) { | ||
| client.query( sql, function (err, data) { | ||
| if ( log ) { | ||
| // log(new Date().toISOString(), '###', sql, err); | ||
| } | ||
| if (err && err.message.match(/unknown database/i)) { | ||
| var dbName = err.message.match(/unknown database '(.*?)'/i)[1]; | ||
| client.query('CREATE DATABASE ' + dbName, function (error) { | ||
| if (!error) { | ||
| client.query(sql, callback); | ||
| if ( err && err.message.match( /unknown database/i ) ) { | ||
| var dbName = err.message.match( /unknown database '(.*?)'/i )[ 1 ]; | ||
| client.query( 'CREATE DATABASE ' + dbName, function (error) { | ||
| if ( !error ) { | ||
| client.query( sql, callback ); | ||
| } else { | ||
| callback(err); | ||
| callback( err ); | ||
| } | ||
| }); | ||
| } else if (err && (err.message.match(/No\s+database\s+selected/gi) || parseInt(err.errno) === 1046)) { | ||
| client.query('USE `' + self.schema.settings.database + '`', function (error) { | ||
| if (!error) { | ||
| client.query(sql, callback); | ||
| } ); | ||
| } else if ( err && (err.message.match( /No\s+database\s+selected/gi ) || parseInt( err.errno ) === 1046) ) { | ||
| client.query( 'USE `' + self.schema.settings.database + '`', function (error) { | ||
| if ( !error ) { | ||
| client.query( sql, callback ); | ||
| } else { | ||
| callback(error); | ||
| callback( error ); | ||
| } | ||
| }); | ||
| } ); | ||
| } else { | ||
| return callback(err, data); | ||
| return callback( err, data ); | ||
| } | ||
| }); | ||
| } ); | ||
| }; | ||
@@ -176,7 +175,7 @@ | ||
| 'use strict'; | ||
| if ('function' === typeof params) { | ||
| if ( 'function' === typeof params ) { | ||
| callback = params; | ||
| params = null; | ||
| } | ||
| this.query('START TRANSACTION', callback); | ||
| this.query( 'START TRANSACTION', callback ); | ||
| }; | ||
@@ -191,7 +190,7 @@ | ||
| 'use strict'; | ||
| if ('function' === typeof params) { | ||
| if ( 'function' === typeof params ) { | ||
| callback = params; | ||
| params = null; | ||
| } | ||
| this.query('COMMIT', callback); | ||
| this.query( 'COMMIT', callback ); | ||
| }; | ||
@@ -206,7 +205,7 @@ | ||
| 'use strict'; | ||
| if ('function' === typeof params) { | ||
| if ( 'function' === typeof params ) { | ||
| callback = params; | ||
| params = null; | ||
| } | ||
| this.query('ROLLBACK', callback); | ||
| this.query( 'ROLLBACK', callback ); | ||
| }; | ||
@@ -224,14 +223,14 @@ | ||
| var self = this, sql = "", keyName = params.name || null, afld = [], kind = ""; | ||
| Object.keys(fields).forEach(function (field) { | ||
| if (!keyName) { | ||
| Object.keys( fields ).forEach( function (field) { | ||
| if ( !keyName ) { | ||
| keyName = "idx_" + field; | ||
| } | ||
| afld.push('`' + field + '`'); | ||
| }); | ||
| if (params.unique) { | ||
| afld.push( '`' + field + '`' ); | ||
| } ); | ||
| if ( params.unique ) { | ||
| kind = "UNIQUE"; | ||
| } | ||
| // CREATE INDEX IF NOT EXISTS xi ON xx5 (x); | ||
| sql += 'CREATE INDEX IF NOT EXISTS ' + kind + ' INDEX `' + keyName + '` ON `' + model + '` (' + afld.join(', ') + ');'; | ||
| self.query(sql, callback); | ||
| sql += 'CREATE INDEX IF NOT EXISTS ' + kind + ' INDEX `' + keyName + '` ON `' + model + '` (' + afld.join( ', ' ) + ');'; | ||
| self.query( sql, callback ); | ||
| }; | ||
@@ -249,12 +248,12 @@ | ||
| var self = this, sql = [], m = props; | ||
| for (var prop in m.properties) { | ||
| if ('undefined' !== typeof m.properties[prop]['index'] | ||
| || 'undefined' !== typeof m.properties[prop]['unique']) { | ||
| var UNIQ = 'undefined' !== typeof m.properties[prop]['unique'] ? ' UNIQUE ' : ''; | ||
| sql.push(' ADD ' + UNIQ + ' INDEX `' + prop + '` (`' + prop + '`)'); | ||
| for ( var prop in m.properties ) { | ||
| if ( 'undefined' !== typeof m.properties[ prop ][ 'index' ] | ||
| || 'undefined' !== typeof m.properties[ prop ][ 'unique' ] ) { | ||
| var UNIQ = 'undefined' !== typeof m.properties[ prop ][ 'unique' ] ? ' UNIQUE ' : ''; | ||
| sql.push( ' ADD ' + UNIQ + ' INDEX `' + prop + '` (`' + prop + '`)' ); | ||
| } | ||
| } | ||
| if (sql.length) { | ||
| self.command('ALTER TABLE ' + self.tableEscaped(model) + sql.join(',\n') + ';', done); | ||
| if ( sql.length ) { | ||
| self.command( 'ALTER TABLE ' + self.tableEscaped( model ) + sql.join( ',\n' ) + ';', done ); | ||
| } else { | ||
@@ -272,6 +271,6 @@ done(); | ||
| 'use strict'; | ||
| var fields = this.toFields(model, data); | ||
| var sql = 'INSERT INTO ' + this.tableEscaped(model); | ||
| var fields = this.toFields( model, data ); | ||
| var sql = 'INSERT INTO ' + this.tableEscaped( model ); | ||
| if (fields) { | ||
| if ( fields ) { | ||
| sql += ' SET ' + fields; | ||
@@ -282,5 +281,5 @@ } else { | ||
| this.query(sql, function (err, info) { | ||
| callback(err, info && info.insertId); | ||
| }); | ||
| this.query( sql, function (err, info) { | ||
| callback( err, info && info.insertId ); | ||
| } ); | ||
| }; | ||
@@ -297,7 +296,7 @@ | ||
| 'use strict'; | ||
| if ('function' === typeof filter) { | ||
| return filter(new Error("Get parametrs undefined"), null); | ||
| if ( 'function' === typeof filter ) { | ||
| return filter( new Error( "Get parametrs undefined" ), null ); | ||
| } | ||
| if ('function' === typeof data) { | ||
| return data(new Error("Set parametrs undefined"), null); | ||
| if ( 'function' === typeof data ) { | ||
| return data( new Error( "Set parametrs undefined" ), null ); | ||
| } | ||
@@ -307,22 +306,22 @@ filter = filter.where ? filter.where : filter; | ||
| var combined = []; | ||
| var props = self._models[model].properties; | ||
| Object.keys(data).forEach(function (key) { | ||
| if (props[key] || key === 'id') { | ||
| var props = self._models[ model ].properties; | ||
| Object.keys( data ).forEach( function (key) { | ||
| if ( props[ key ] || key === 'id' ) { | ||
| var k = '`' + key + '`'; | ||
| var v; | ||
| if (key !== 'id') { | ||
| v = self.toDatabase(props[key], data[key]); | ||
| if ( key !== 'id' ) { | ||
| v = self.toDatabase( props[ key ], data[ key ] ); | ||
| } else { | ||
| v = data[key]; | ||
| v = data[ key ]; | ||
| } | ||
| combined.push(k + ' = ' + v); | ||
| combined.push( k + ' = ' + v ); | ||
| } | ||
| }); | ||
| var sql = 'UPDATE ' + this.tableEscaped(model); | ||
| sql += ' SET ' + combined.join(', '); | ||
| sql += ' ' + self.buildWhere(filter, self, model); | ||
| } ); | ||
| var sql = 'UPDATE ' + this.tableEscaped( model ); | ||
| sql += ' SET ' + combined.join( ', ' ); | ||
| sql += ' ' + self.buildWhere( filter, self, model ); | ||
| this.query(sql, function (err, affected) { | ||
| callback(err, ((affected || {}).affectedRows || affected)); | ||
| }); | ||
| this.query( sql, function (err, affected) { | ||
| callback( err, ((affected || {}).affectedRows || affected) ); | ||
| } ); | ||
| }; | ||
@@ -333,9 +332,9 @@ | ||
| var fields = []; | ||
| var props = this._models[model].properties; | ||
| Object.keys(data).forEach(function (key) { | ||
| if (props[key]) { | ||
| fields.push('`' + key.replace(/\./g, '`.`') + '` = ' + this.toDatabase(props[key], data[key])); | ||
| var props = this._models[ model ].properties; | ||
| Object.keys( data ).forEach( function (key) { | ||
| if ( props[ key ] ) { | ||
| fields.push( '`' + key.replace( /\./g, '`.`' ) + '` = ' + this.toDatabase( props[ key ], data[ key ] ) ); | ||
| } | ||
| }.bind(this)); | ||
| return fields.join(','); | ||
| }.bind( this ) ); | ||
| return fields.join( ',' ); | ||
| }; | ||
@@ -346,7 +345,7 @@ | ||
| return val.getUTCFullYear() + '-' + | ||
| fillZeros(val.getUTCMonth() + 1) + '-' + | ||
| fillZeros(val.getUTCDate()) + ' ' + | ||
| fillZeros(val.getUTCHours()) + ':' + | ||
| fillZeros(val.getUTCMinutes()) + ':' + | ||
| fillZeros(val.getUTCSeconds()); | ||
| fillZeros( val.getUTCMonth() + 1 ) + '-' + | ||
| fillZeros( val.getUTCDate() ) + ' ' + | ||
| fillZeros( val.getUTCHours() ) + ':' + | ||
| fillZeros( val.getUTCMinutes() ) + ':' + | ||
| fillZeros( val.getUTCSeconds() ); | ||
@@ -361,28 +360,28 @@ function fillZeros(v) { | ||
| 'use strict'; | ||
| if (val === null) { | ||
| if ( val === null ) { | ||
| return 'NULL'; | ||
| } | ||
| if (val.constructor.name === 'Object') { | ||
| var operator = Object.keys(val)[0]; | ||
| val = val[operator]; | ||
| if (operator === 'between') { | ||
| if (prop.type.name === 'Date') { | ||
| return 'STR_TO_DATE(' + this.toDatabase(prop, val[0]) + ', "%Y-%m-%d %H:%i:%s")' + | ||
| if ( val.constructor.name === 'Object' ) { | ||
| var operator = Object.keys( val )[ 0 ]; | ||
| val = val[ operator ]; | ||
| if ( operator === 'between' ) { | ||
| if ( prop.type.name === 'Date' ) { | ||
| return 'STR_TO_DATE(' + this.toDatabase( prop, val[ 0 ] ) + ', "%Y-%m-%d %H:%i:%s")' + | ||
| ' AND STR_TO_DATE(' + | ||
| this.toDatabase(prop, val[1]) + ', "%Y-%m-%d %H:%i:%s")'; | ||
| this.toDatabase( prop, val[ 1 ] ) + ', "%Y-%m-%d %H:%i:%s")'; | ||
| } else { | ||
| return this.toDatabase(prop, val[0]) + | ||
| return this.toDatabase( prop, val[ 0 ] ) + | ||
| ' AND ' + | ||
| this.toDatabase(prop, val[1]); | ||
| this.toDatabase( prop, val[ 1 ] ); | ||
| } | ||
| } else if (operator === 'in' || operator === 'inq' || operator === 'nin') { | ||
| if (!(val.propertyIsEnumerable('length')) && typeof val === 'object' && typeof val.length === 'number') { //if value is array | ||
| for (var i = 0; i < val.length; i++) { | ||
| if(/^"(?:\\"|.)*?"$/gi.test(val[i]) || /^'(?:\\'|.)*?'$/gi.test(val[i])) { | ||
| val[i] = val[i]; | ||
| } else if ( operator === 'in' || operator === 'inq' || operator === 'nin' ) { | ||
| if ( !(val.propertyIsEnumerable( 'length' )) && typeof val === 'object' && typeof val.length === 'number' ) { //if value is array | ||
| for ( var i = 0; i < val.length; i++ ) { | ||
| if ( /^"(?:\\"|.)*?"$/gi.test( val[ i ] ) || /^'(?:\\'|.)*?'$/gi.test( val[ i ] ) ) { | ||
| val[ i ] = val[ i ]; | ||
| } else { | ||
| val[i] = this.client.escape(val[i]); | ||
| val[ i ] = this.client.escape( val[ i ] ); | ||
| } | ||
| } | ||
| return val.join(','); | ||
| return val.join( ',' ); | ||
| } else { | ||
@@ -393,28 +392,28 @@ return val; | ||
| } | ||
| if (!prop) { | ||
| if ( !prop ) { | ||
| return val; | ||
| } | ||
| if (prop.type.name === 'Number') { | ||
| if ( prop.type.name === 'Number' ) { | ||
| return val; | ||
| } | ||
| if (prop.type.name === 'Date') { | ||
| if (!val) { | ||
| if ( prop.type.name === 'Date' ) { | ||
| if ( !val ) { | ||
| return 'NULL'; | ||
| } | ||
| if (typeof val === 'string') { | ||
| val = val.split('.')[0].replace('T', ' '); | ||
| val = Date.parse(val); | ||
| if ( typeof val === 'string' ) { | ||
| val = val.split( '.' )[ 0 ].replace( 'T', ' ' ); | ||
| val = Date.parse( val ); | ||
| } | ||
| if (typeof val === 'number') { | ||
| val = new Date(val); | ||
| if ( typeof val === 'number' ) { | ||
| val = new Date( val ); | ||
| } | ||
| if (val instanceof Date) { | ||
| val = '"' + dateToMysql(val) + '"'; | ||
| if ( val instanceof Date ) { | ||
| val = '"' + dateToMysql( val ) + '"'; | ||
| } | ||
| return val; | ||
| } | ||
| if (prop.type.name === "Boolean") { | ||
| if ( prop.type.name === "Boolean" ) { | ||
| return val ? 1 : 0; | ||
| } | ||
| return /^"(?:\\"|.)*?"$/gi.test(val) || /^'(?:\\'|.)*?'$/gi.test(val) ? val : this.client.escape(val); | ||
| return /^"(?:\\"|.)*?"$/gi.test( val ) || /^'(?:\\'|.)*?'$/gi.test( val ) ? val : this.client.escape( val ); | ||
| }; | ||
@@ -424,16 +423,16 @@ | ||
| 'use strict'; | ||
| if (!data) { | ||
| if ( !data ) { | ||
| return null; | ||
| } | ||
| var props = this._models[model].properties; | ||
| Object.keys(data).forEach(function (key) { | ||
| var val = data[key]; | ||
| if (props[key]) { | ||
| if (props[key].type.name === 'Date' && val !== null) { | ||
| val = new Date(val.toString().replace(/GMT.*$/, 'GMT')); | ||
| var props = this._models[ model ].properties; | ||
| Object.keys( data ).forEach( function (key) { | ||
| var val = data[ key ]; | ||
| if ( props[ key ] ) { | ||
| if ( props[ key ].type.name === 'Date' && val !== null ) { | ||
| val = new Date( val.toString().replace( /GMT.*$/, 'GMT' ) ); | ||
| } | ||
| if ((props[key].type.name || '').toString().toLowerCase() === 'json' && typeof val == "string") { | ||
| if ( (props[ key ].type.name || '').toString().toLowerCase() === 'json' && typeof val == "string" ) { | ||
| try { | ||
| val = JSON.parse(val); | ||
| } catch (err) { | ||
| val = JSON.parse( val ); | ||
| } catch ( err ) { | ||
@@ -443,4 +442,4 @@ } | ||
| } | ||
| data[key] = val; | ||
| }); | ||
| data[ key ] = val; | ||
| } ); | ||
| return data; | ||
@@ -451,3 +450,3 @@ }; | ||
| 'use strict'; | ||
| return '`' + name.replace(/\./g, '`.`') + '`'; | ||
| return '`' + name.replace( /\./g, '`.`' ) + '`'; | ||
| }; | ||
@@ -458,39 +457,39 @@ | ||
| var self = this, sFields = '*'; | ||
| if ('function' === typeof filter) { | ||
| if ( 'function' === typeof filter ) { | ||
| callback = filter; | ||
| filter = {}; | ||
| } | ||
| if (!filter) { | ||
| if ( !filter ) { | ||
| filter = {}; | ||
| } | ||
| var sql = 'SELECT ' + sFields + ' FROM ' + self.tableEscaped(model); | ||
| var sql = 'SELECT ' + sFields + ' FROM ' + self.tableEscaped( model ); | ||
| if (filter) { | ||
| if ( filter ) { | ||
| if (filter.fields) { | ||
| if (typeof filter.fields === 'string') { | ||
| sFields = self.tableEscaped(filter.fields); | ||
| } else if (Object.prototype.toString.call(filter.fields) === '[object Array]') { | ||
| sFields = filter.fields.map(function (field) { | ||
| if ( filter.fields ) { | ||
| if ( typeof filter.fields === 'string' ) { | ||
| sFields = self.tableEscaped( filter.fields ); | ||
| } else if ( Object.prototype.toString.call( filter.fields ) === '[object Array]' ) { | ||
| sFields = filter.fields.map( function (field) { | ||
| return '`' + field + '`'; | ||
| }).join(', '); | ||
| } ).join( ', ' ); | ||
| } | ||
| sql = sql.replace('*', sFields); | ||
| sql = sql.replace( '*', sFields ); | ||
| } | ||
| if (filter.where) { | ||
| sql += ' ' + self.buildWhere(filter.where, self, model); | ||
| if ( filter.where ) { | ||
| sql += ' ' + self.buildWhere( filter.where, self, model ); | ||
| } | ||
| if (filter.order) { | ||
| sql += ' ' + self.buildOrderBy(filter.order); | ||
| if ( filter.order ) { | ||
| sql += ' ' + self.buildOrderBy( filter.order ); | ||
| } | ||
| if (filter.group) { | ||
| sql += ' ' + self.buildGroupBy(filter.group); | ||
| if ( filter.group ) { | ||
| sql += ' ' + self.buildGroupBy( filter.group ); | ||
| } | ||
| if (filter.limit) { | ||
| sql += ' ' + self.buildLimit(filter.limit, filter.offset || filter.skip || 0); | ||
| if ( filter.limit ) { | ||
| sql += ' ' + self.buildLimit( filter.limit, filter.offset || filter.skip || 0 ); | ||
| } | ||
@@ -500,10 +499,10 @@ | ||
| this.query(sql, function (err, data) { | ||
| if (err) { | ||
| return callback(err, []); | ||
| this.query( sql, function (err, data) { | ||
| if ( err ) { | ||
| return callback( err, [] ); | ||
| } | ||
| callback(null, data.map(function (obj) { | ||
| return self.fromDatabase(model, obj); | ||
| })); | ||
| }.bind(this)); | ||
| callback( null, data.map( function (obj) { | ||
| return self.fromDatabase( model, obj ); | ||
| } ) ); | ||
| }.bind( this ) ); | ||
@@ -521,20 +520,20 @@ return sql; | ||
| var wait = 0; | ||
| Object.keys(this._models).forEach(function (model) { | ||
| Object.keys( this._models ).forEach( function (model) { | ||
| wait += 1; | ||
| self.query('SHOW FIELDS FROM ' + self.tableEscaped(model), function (err, fields) { | ||
| self.query('SHOW INDEXES FROM ' + self.tableEscaped(model), function (err, indexes) { | ||
| if (!err && fields.length) { | ||
| self.alterTable(model, fields, indexes, done); | ||
| self.query( 'SHOW FIELDS FROM ' + self.tableEscaped( model ), function (err, fields) { | ||
| self.query( 'SHOW INDEXES FROM ' + self.tableEscaped( model ), function (err, indexes) { | ||
| if ( !err && fields.length ) { | ||
| self.alterTable( model, fields, indexes, done ); | ||
| } else { | ||
| self.createTable(model, indexes, done); | ||
| self.createTable( model, indexes, done ); | ||
| } | ||
| }); | ||
| }); | ||
| }); | ||
| } ); | ||
| } ); | ||
| } ); | ||
| function done(err) { | ||
| if (err) { | ||
| console.log(err); | ||
| if ( err ) { | ||
| console.log( err ); | ||
| } | ||
| if (--wait === 0 && cb) { | ||
| if ( --wait === 0 && cb ) { | ||
| cb(); | ||
@@ -555,18 +554,18 @@ } | ||
| var wait = 0; | ||
| Object.keys(this._models).forEach(function (model) { | ||
| Object.keys( this._models ).forEach( function (model) { | ||
| wait += 1; | ||
| self.query('SHOW FIELDS FROM ' + model, function (err, fields) { | ||
| self.query('SHOW INDEXES FROM ' + model, function (err, indexes) { | ||
| self.alterTable(model, fields, indexes, done, true); | ||
| }); | ||
| }); | ||
| }); | ||
| self.query( 'SHOW FIELDS FROM ' + model, function (err, fields) { | ||
| self.query( 'SHOW INDEXES FROM ' + model, function (err, indexes) { | ||
| self.alterTable( model, fields, indexes, done, true ); | ||
| } ); | ||
| } ); | ||
| } ); | ||
| function done(err, needAlter) { | ||
| if (err) { | ||
| console.log(err); | ||
| if ( err ) { | ||
| console.log( err ); | ||
| } | ||
| ok = ok || needAlter; | ||
| if (--wait === 0 && cb) { | ||
| cb(null, !ok); | ||
| if ( --wait === 0 && cb ) { | ||
| cb( null, !ok ); | ||
| } | ||
@@ -579,16 +578,16 @@ } | ||
| var self = this; | ||
| var m = this._models[model]; | ||
| var propNames = Object.keys(m.properties).filter(function (name) { | ||
| return !!m.properties[name]; | ||
| }); | ||
| var indexNames = m.settings.indexes ? Object.keys(m.settings.indexes).filter(function (name) { | ||
| return !!m.settings.indexes[name]; | ||
| }) : []; | ||
| var m = this._models[ model ]; | ||
| var propNames = Object.keys( m.properties ).filter( function (name) { | ||
| return !!m.properties[ name ]; | ||
| } ); | ||
| var indexNames = m.settings.indexes ? Object.keys( m.settings.indexes ).filter( function (name) { | ||
| return !!m.settings.indexes[ name ]; | ||
| } ) : []; | ||
| var sql = []; | ||
| var ai = {}; | ||
| if (actualIndexes) { | ||
| actualIndexes.forEach(function (i) { | ||
| if ( actualIndexes ) { | ||
| actualIndexes.forEach( function (i) { | ||
| var name = i.Key_name; | ||
| if (!ai[name]) { | ||
| ai[name] = { | ||
| if ( !ai[ name ] ) { | ||
| ai[ name ] = { | ||
| info: i, | ||
@@ -598,48 +597,48 @@ columns: [] | ||
| } | ||
| ai[name].columns[i.Seq_in_index - 1] = i.Column_name; | ||
| }); | ||
| ai[ name ].columns[ i.Seq_in_index - 1 ] = i.Column_name; | ||
| } ); | ||
| } | ||
| var aiNames = Object.keys(ai); | ||
| var aiNames = Object.keys( ai ); | ||
| // change/add new fields | ||
| propNames.forEach(function (propName) { | ||
| if (propName === 'id') { | ||
| propNames.forEach( function (propName) { | ||
| if ( propName === 'id' ) { | ||
| return; | ||
| } | ||
| var found; | ||
| actualFields.forEach(function (f) { | ||
| if (f.Field === propName) { | ||
| actualFields.forEach( function (f) { | ||
| if ( f.Field === propName ) { | ||
| found = f; | ||
| } | ||
| }); | ||
| } ); | ||
| if (found) { | ||
| actualize(propName, found); | ||
| if ( found ) { | ||
| actualize( propName, found ); | ||
| } else { | ||
| sql.push('ADD COLUMN `' + propName + '` ' + self.propertySettingsSQL(model, propName)); | ||
| sql.push( 'ADD COLUMN `' + propName + '` ' + self.propertySettingsSQL( model, propName ) ); | ||
| } | ||
| }); | ||
| } ); | ||
| // drop columns | ||
| actualFields.forEach(function (f) { | ||
| var notFound = !~propNames.indexOf(f.Field); | ||
| if (f.Field === 'id') { | ||
| actualFields.forEach( function (f) { | ||
| var notFound = !~propNames.indexOf( f.Field ); | ||
| if ( f.Field === 'id' ) { | ||
| return; | ||
| } | ||
| if (notFound || !m.properties[f.Field]) { | ||
| sql.push('DROP COLUMN `' + f.Field + '` '); | ||
| if ( notFound || !m.properties[ f.Field ] ) { | ||
| sql.push( 'DROP COLUMN `' + f.Field + '` ' ); | ||
| } | ||
| }); | ||
| } ); | ||
| // remove indexes | ||
| aiNames.forEach(function (indexName) { | ||
| if (indexName === 'id' || indexName === 'PRIMARY') { | ||
| aiNames.forEach( function (indexName) { | ||
| if ( indexName === 'id' || indexName === 'PRIMARY' ) { | ||
| return; | ||
| } | ||
| if (indexNames.indexOf(indexName) === -1 && !m.properties[indexName] || m.properties[indexName] && !m.properties[indexName].index) { | ||
| sql.push('DROP INDEX `' + indexName + '`'); | ||
| if ( (indexNames.indexOf( indexName ) === -1 && !m.properties[ indexName ]) | ||
| || ((m.properties[ indexName ] && !m.properties[ indexName ].index) | ||
| && (m.properties[ indexName ] && !m.properties[ indexName ].unique)) ) { | ||
| sql.push( 'DROP INDEX `' + indexName + '`' ); | ||
| } else { | ||
| // first: check single (only type and kind) | ||
| if (m.properties[indexName] && !m.properties[indexName].index) { | ||
| if ( m.properties[ indexName ] && (!m.properties[ indexName ].index || !m.properties[ indexName ].unique) ) { | ||
| // TODO | ||
@@ -650,70 +649,76 @@ return; | ||
| var orderMatched = true; | ||
| if (indexNames.indexOf(indexName) !== -1) { | ||
| m.settings.indexes[indexName].columns.split(/,\s*/).forEach(function (columnName, i) { | ||
| if (ai[indexName].columns[i] !== columnName) | ||
| if ( indexNames.indexOf( indexName ) !== -1 ) { | ||
| m.settings.indexes[ indexName ].columns.split( /,\s*/ ).forEach( function (columnName, i) { | ||
| if ( ai[ indexName ].columns[ i ] !== columnName ) | ||
| orderMatched = false; | ||
| }); | ||
| } ); | ||
| } | ||
| if (!orderMatched) { | ||
| sql.push('DROP INDEX `' + indexName + '`'); | ||
| delete ai[indexName]; | ||
| if ( !orderMatched ) { | ||
| sql.push( 'DROP INDEX `' + indexName + '`' ); | ||
| delete ai[ indexName ]; | ||
| } | ||
| } | ||
| }); | ||
| } ); | ||
| // add single-column indexes | ||
| propNames.forEach(function (propName) { | ||
| var i = m.properties[propName].index || m.properties[propName].unique; | ||
| if (!i) { | ||
| propNames.forEach( function (propName) { | ||
| var i = m.properties[ propName ].index || m.properties[ propName ].unique; | ||
| if ( !i ) { | ||
| return; | ||
| } | ||
| var found = ai[propName] && ai[propName].info; | ||
| if (!found) { | ||
| var prop = m.properties[propName]; | ||
| var found = ai[ propName ] && ai[ propName ].info; | ||
| if ( !found ) { | ||
| var prop = m.properties[ propName ]; | ||
| var type = ''; | ||
| var kind = ''; | ||
| if (i.type) { | ||
| if ( i.type ) { | ||
| type = 'USING ' + i.type; | ||
| } | ||
| if (i.kind || prop.unique) { | ||
| if ( i.kind || prop.unique ) { | ||
| kind = i.kind ? i.kind : 'UNIQUE'; | ||
| } | ||
| if (kind && type) { | ||
| sql.push('ADD ' + kind + ' INDEX `' + propName + '` (`' + propName + '`) ' + type); | ||
| if ( kind && type ) { | ||
| sql.push( 'ADD ' + kind + ' INDEX `' + propName + '` (`' + propName + '`) ' + type ); | ||
| } else { | ||
| sql.push('ADD ' + kind + ' INDEX `' + propName + '` ' + type + ' (`' + propName + '`) '); | ||
| sql.push( 'ADD ' + kind + ' INDEX `' + propName + '` ' + type + ' (`' + propName + '`) ' ); | ||
| } | ||
| ai[ propName ] = { | ||
| info: true | ||
| }; | ||
| } | ||
| }); | ||
| } ); | ||
| // add multi-column indexes | ||
| indexNames.forEach(function (indexName) { | ||
| var i = m.settings.indexes[indexName]; | ||
| var found = ai[indexName] && ai[indexName].info; | ||
| if (!found) { | ||
| indexNames.forEach( function (indexName) { | ||
| var i = m.settings.indexes[ indexName ]; | ||
| var found = ai[ indexName ] && ai[ indexName ].info; | ||
| if ( !found ) { | ||
| var type = ''; | ||
| var kind = ''; | ||
| if (i.type) { | ||
| if ( i.type ) { | ||
| type = 'USING ' + i.kind; | ||
| } | ||
| if (i.kind) { | ||
| if ( i.kind ) { | ||
| kind = i.kind; | ||
| } | ||
| if (kind && type) { | ||
| sql.push('ADD ' + kind + ' INDEX `' + indexName + '` (' + i.columns + ') ' + type); | ||
| var columns = i.columns.split( ',' ).map( function (c) { | ||
| return '`' + c.replace( /^\s+|\s+$/, '' ) + "`"; | ||
| } ).join( ',' ); | ||
| if ( kind && type ) { | ||
| sql.push( 'ADD ' + kind + ' INDEX `' + indexName + '` (' + columns + ') ' + type ); | ||
| } else { | ||
| sql.push('ADD ' + kind + ' INDEX ' + type + ' `' + indexName + '` (' + i.columns + ')'); | ||
| sql.push( 'ADD ' + kind + ' INDEX ' + type + ' `' + indexName + '` (' + columns + ')' ); | ||
| } | ||
| } | ||
| }); | ||
| } ); | ||
| if (sql.length) { | ||
| var query = 'ALTER TABLE ' + self.tableEscaped(model) + ' \n' + sql.join(',\n'); | ||
| if (checkOnly) { | ||
| done(null, true, { | ||
| if ( sql.length ) { | ||
| var query = 'ALTER TABLE ' + self.tableEscaped( model ) + ' \n' + sql.join( ',\n' ); | ||
| if ( checkOnly ) { | ||
| done( null, true, { | ||
| statements: sql, | ||
| query: query | ||
| }); | ||
| } ); | ||
| } else { | ||
| this.query(query, done); | ||
| this.query( query, done ); | ||
| } | ||
@@ -726,5 +731,5 @@ } else { | ||
| 'use strict'; | ||
| var newSettings = m.properties[propName]; | ||
| if (newSettings && changed(newSettings, oldSettings)) { | ||
| sql.push('CHANGE COLUMN `' + propName + '` `' + propName + '` ' + self.propertySettingsSQL(model, propName)); | ||
| var newSettings = m.properties[ propName ]; | ||
| if ( newSettings && changed( newSettings, oldSettings ) ) { | ||
| sql.push( 'CHANGE COLUMN `' + propName + '` `' + propName + '` ' + self.propertySettingsSQL( model, propName ) ); | ||
| } | ||
@@ -735,9 +740,9 @@ } | ||
| 'use strict'; | ||
| if (oldSettings.Null === 'YES' && (newSettings.allowNull === false || newSettings.null === false)) { | ||
| if ( oldSettings.Null === 'YES' && (newSettings.allowNull === false || newSettings.null === false) ) { | ||
| return true; | ||
| } | ||
| if (oldSettings.Null === 'NO' && (getDefaultValue(newSettings) !== getDefaultValue(oldSettings))) { | ||
| if ( oldSettings.Null === 'NO' && (getDefaultValue( newSettings ) !== getDefaultValue( oldSettings )) ) { | ||
| return true; | ||
| } | ||
| if (oldSettings.Type.toUpperCase() !== datatype(newSettings)) { | ||
| if ( oldSettings.Type.toUpperCase() !== datatype( newSettings ) ) { | ||
| return true; | ||
@@ -753,41 +758,41 @@ } | ||
| var sql = []; | ||
| var primaryKeys = this._models[model].settings.primaryKeys || []; | ||
| var foreignKeys = this._models[model].settings.foreignKeys || []; | ||
| var primaryKeys = this._models[ model ].settings.primaryKeys || []; | ||
| var foreignKeys = this._models[ model ].settings.foreignKeys || []; | ||
| primaryKeys = primaryKeys.slice(0); | ||
| foreignKeys = foreignKeys.slice(0); | ||
| primaryKeys = primaryKeys.slice( 0 ); | ||
| foreignKeys = foreignKeys.slice( 0 ); | ||
| Object.keys(this._models[model].properties).forEach(function (prop) { | ||
| if (prop === 'id') { | ||
| Object.keys( this._models[ model ].properties ).forEach( function (prop) { | ||
| if ( prop === 'id' ) { | ||
| return; | ||
| } | ||
| return sql.push('`' + prop + '` ' + self.propertySettingsSQL(model, prop)); | ||
| }); | ||
| return sql.push( '`' + prop + '` ' + self.propertySettingsSQL( model, prop ) ); | ||
| } ); | ||
| if (primaryKeys.length) { | ||
| for (var i = 0, length = primaryKeys.length; i < length; i++) { | ||
| primaryKeys[i] = "`" + primaryKeys[i] + "`"; | ||
| if ( primaryKeys.length ) { | ||
| for ( var i = 0, length = primaryKeys.length; i < length; i++ ) { | ||
| primaryKeys[ i ] = "`" + primaryKeys[ i ] + "`"; | ||
| } | ||
| sql.push("PRIMARY KEY (" + primaryKeys.join(', ') + ")"); | ||
| sql.push( "PRIMARY KEY (" + primaryKeys.join( ', ' ) + ")" ); | ||
| } else { | ||
| sql.push('`id` INT(11) NOT NULL AUTO_INCREMENT UNIQUE PRIMARY KEY'); | ||
| sql.push( '`id` INT(11) NOT NULL AUTO_INCREMENT UNIQUE PRIMARY KEY' ); | ||
| } | ||
| if (foreignKeys.length) { | ||
| for (var i = 0, length = foreignKeys.length; i < length; i++) { | ||
| var foreignKey = foreignKeys[i]; | ||
| var str = "FOREIGN KEY (`" + foreignKeys[i].localCol + "`) REFERENCES " + foreignKey.foreignTable + "(`" + foreignKey.foreignCol + "`)"; | ||
| if ( foreignKeys.length ) { | ||
| for ( var i = 0, length = foreignKeys.length; i < length; i++ ) { | ||
| var foreignKey = foreignKeys[ i ]; | ||
| var str = "FOREIGN KEY (`" + foreignKeys[ i ].localCol + "`) REFERENCES " + foreignKey.foreignTable + "(`" + foreignKey.foreignCol + "`)"; | ||
| if (foreignKey.onDelete) { | ||
| if ( foreignKey.onDelete ) { | ||
| str += " ON DELETE CASCADE"; | ||
| } | ||
| if (foreignKey.onUpdate) { | ||
| if ( foreignKey.onUpdate ) { | ||
| str += " ON UPDATE CASCADE"; | ||
| } | ||
| sql.push(str); | ||
| sql.push( str ); | ||
| } | ||
| } | ||
| return sql.join(',\n '); | ||
| return sql.join( ',\n ' ); | ||
| }; | ||
@@ -797,14 +802,14 @@ | ||
| 'use strict'; | ||
| var p = this._models[model].properties[prop], field = []; | ||
| var p = this._models[ model ].properties[ prop ], field = []; | ||
| field.push(datatype(p)); | ||
| field.push(p.allowNull === false || p['null'] === false ? 'NOT NULL' : 'NULL'); | ||
| if (typeof p['default'] !== 'undefined' && acceptedDefaults(p) && typeof p['default'] !== 'function') { | ||
| field.push('DEFAULT ' + getDefaultValue(p)); | ||
| field.push( datatype( p ) ); | ||
| field.push( p.allowNull === false || (typeof p[ 'default' ] !== 'undefined' && acceptedDefaults( p )) ? 'NOT NULL' : 'NULL' ); | ||
| if ( typeof p[ 'default' ] !== 'undefined' && acceptedDefaults( p ) && typeof p[ 'default' ] !== 'function' ) { | ||
| field.push( 'DEFAULT ' + getDefaultValue( p ) ); | ||
| } | ||
| if (p.unique === true) { | ||
| field.push('UNIQUE'); | ||
| if ( p.unique === true ) { | ||
| field.push( 'UNIQUE' ); | ||
| } | ||
| return field.join(" "); | ||
| return field.join( " " ); | ||
| }; | ||
@@ -815,3 +820,3 @@ | ||
| var dt = ''; | ||
| switch ((p.type.name || 'string').toLowerCase()) { | ||
| switch ( (p.type.name || 'string').toLowerCase() ) { | ||
| case 'json': | ||
@@ -824,3 +829,3 @@ case 'text': | ||
| case 'number': | ||
| var ftype = (parseFloat(p.limit) > 11) ? "BIGINT" : "INT"; | ||
| var ftype = (parseFloat( p.limit ) > 11) ? "BIGINT" : "INT"; | ||
| dt = ftype + '(' + (p.limit || 11) + ')'; | ||
@@ -852,25 +857,25 @@ break; | ||
| self = adapter, | ||
| props = self._models[model].properties; | ||
| props = self._models[ model ].properties; | ||
| Object.keys(conds).forEach(function (key) { | ||
| if (key !== 'or') { | ||
| cs = parseCond(cs, key, props, conds, self); | ||
| Object.keys( conds ).forEach( function (key) { | ||
| if ( key !== 'or' ) { | ||
| cs = parseCond( cs, key, props, conds, self ); | ||
| } else { | ||
| conds[key].forEach(function (oconds) { | ||
| Object.keys(oconds).forEach(function (okey) { | ||
| or = parseCond(or, okey, props, oconds, self); | ||
| }); | ||
| }); | ||
| conds[ key ].forEach( function (oconds) { | ||
| Object.keys( oconds ).forEach( function (okey) { | ||
| or = parseCond( or, okey, props, oconds, self ); | ||
| } ); | ||
| } ); | ||
| } | ||
| }); | ||
| } ); | ||
| if (cs.length === 0 && or.length === 0) { | ||
| if ( cs.length === 0 && or.length === 0 ) { | ||
| return ''; | ||
| } | ||
| var orop = ""; | ||
| if (or.length) { | ||
| orop = ' (' + or.join(' OR ') + ') '; | ||
| if ( or.length ) { | ||
| orop = ' (' + or.join( ' OR ' ) + ') '; | ||
| } | ||
| orop += (orop !== "" && cs.length > 0) ? ' AND ' : ''; | ||
| return 'WHERE ' + orop + cs.join(' AND '); | ||
| return 'WHERE ' + orop + cs.join( ' AND ' ); | ||
| }; | ||
@@ -880,15 +885,15 @@ | ||
| 'use strict'; | ||
| var keyEscaped = '`' + key.replace(/\./g, '`.`') + '`'; | ||
| var val = self.toDatabase(props[key], conds[key]); | ||
| if (conds[key] === null) { | ||
| cs.push(keyEscaped + ' IS NULL'); | ||
| } else if (conds[key].constructor.name === 'Object') { | ||
| Object.keys(conds[key]).forEach(function (condType) { | ||
| val = self.toDatabase(props[key], conds[key][condType]); | ||
| var keyEscaped = '`' + key.replace( /\./g, '`.`' ) + '`'; | ||
| var val = self.toDatabase( props[ key ], conds[ key ] ); | ||
| if ( conds[ key ] === null ) { | ||
| cs.push( keyEscaped + ' IS NULL' ); | ||
| } else if ( conds[ key ].constructor.name === 'Object' ) { | ||
| Object.keys( conds[ key ] ).forEach( function (condType) { | ||
| val = self.toDatabase( props[ key ], conds[ key ][ condType ] ); | ||
| var sqlCond = keyEscaped; | ||
| if ((condType === 'inq' || condType === 'nin') && val.length === 0) { | ||
| cs.push(condType === 'inq' ? 0 : 1); | ||
| if ( (condType === 'inq' || condType === 'nin') && val.length === 0 ) { | ||
| cs.push( condType === 'inq' ? 0 : 1 ); | ||
| return true; | ||
| } | ||
| switch (condType) { | ||
| switch ( condType ) { | ||
| case 'gt': | ||
@@ -933,5 +938,5 @@ sqlCond += ' > '; | ||
| } | ||
| if (condType === 'between') { | ||
| sqlCond += val[0] + ' AND ' + val[1]; | ||
| } else if (condType === 'in' || condType === 'inq' || condType === 'nin') { | ||
| if ( condType === 'between' ) { | ||
| sqlCond += val[ 0 ] + ' AND ' + val[ 1 ]; | ||
| } else if ( condType === 'in' || condType === 'inq' || condType === 'nin' ) { | ||
| sqlCond += "(" + val + ")"; | ||
@@ -941,10 +946,10 @@ } else { | ||
| } | ||
| cs.push(sqlCond); | ||
| }); | ||
| cs.push( sqlCond ); | ||
| } ); | ||
| } else if (/^\//gi.test(conds[key])) { | ||
| var reg = val.toString().split('/'); | ||
| cs.push(keyEscaped + ' REGEXP "' + reg[1] + '"'); | ||
| } else if ( /^\//gi.test( conds[ key ] ) ) { | ||
| var reg = val.toString().split( '/' ); | ||
| cs.push( keyEscaped + ' REGEXP "' + reg[ 1 ] + '"' ); | ||
| } else { | ||
| cs.push(keyEscaped + ' = ' + val); | ||
| cs.push( keyEscaped + ' = ' + val ); | ||
| } | ||
@@ -956,6 +961,6 @@ return cs; | ||
| 'use strict'; | ||
| if (typeof order === 'string') { | ||
| order = [order]; | ||
| if ( typeof order === 'string' ) { | ||
| order = [ order ]; | ||
| } | ||
| return 'ORDER BY ' + order.join(', '); | ||
| return 'ORDER BY ' + order.join( ', ' ); | ||
| }; | ||
@@ -970,6 +975,6 @@ | ||
| 'use strict'; | ||
| if (typeof group === 'string') { | ||
| group = [group]; | ||
| if ( typeof group === 'string' ) { | ||
| group = [ group ]; | ||
| } | ||
| return 'GROUP BY ' + group.join(', '); | ||
| return 'GROUP BY ' + group.join( ', ' ); | ||
| }; | ||
@@ -979,3 +984,3 @@ | ||
| 'use strict'; | ||
| if (/^INT|^BIGINT|^VAR|^TINY/i.test(datatype(prop))) { | ||
| if ( /^INT|^BIGINT|^VAR|^TINY/i.test( datatype( prop ) ) ) { | ||
| return true; | ||
@@ -989,9 +994,9 @@ } else { | ||
| 'use strict'; | ||
| if (/^INT|^BIGINT/i.test(prop.Type || datatype(prop))) { | ||
| return parseInt(prop['default'] || prop['Default'] || 0); | ||
| } else if (/^TINY/i.test(prop.Type || datatype(prop))) { | ||
| return prop['default'] || prop['Default'] ? 1 : 0; | ||
| if ( /^INT|^BIGINT/i.test( prop.Type || datatype( prop ) ) ) { | ||
| return parseInt( prop[ 'default' ] || prop[ 'Default' ] || 0 ); | ||
| } else if ( /^TINY/i.test( prop.Type || datatype( prop ) ) ) { | ||
| return prop[ 'default' ] || prop[ 'Default' ] ? 1 : 0; | ||
| } else { | ||
| return "'" + (prop['default'] || prop['Default']) + "'"; | ||
| return "'" + (prop[ 'default' ] || prop[ 'Default' ] || '') + "'"; | ||
| } | ||
| } |
| { | ||
| "name": "caminte", | ||
| "description": "ORM for every database: redis, mysql, neo4j, mongodb, rethinkdb, postgres, sqlite, tingodb", | ||
| "version": "0.2.16", | ||
| "version": "0.2.17", | ||
| "author": { | ||
@@ -6,0 +6,0 @@ "name": "Aleksej Gordejev", |
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
- increased by0.18%
700874
- Lines of code
- increased by0.05%
13913
No dependency changes