From 91c90ef3ad6b1b47ca4d8641c2558ab64e8ec7fb Mon Sep 17 00:00:00 2001 From: Anatoliy Chakkaev Date: Fri, 14 Dec 2012 17:12:13 +0400 Subject: [PATCH] Remove sqlite3 adapter --- index.js | 1 + lib/adapters/sqlite3.js | 409 ---------------------------------------- package.json | 3 +- 3 files changed, 2 insertions(+), 411 deletions(-) delete mode 100644 lib/adapters/sqlite3.js diff --git a/index.js b/index.js index 1c85a07c..d5e38509 100644 --- a/index.js +++ b/index.js @@ -4,6 +4,7 @@ var path = require('path'); exports.Schema = require('./lib/schema').Schema; exports.AbstractClass = require('./lib/abstract-class').AbstractClass; exports.Validatable = require('./lib/validatable').Validatable; +exports.BaseSQL = require('./lib/sql'); exports.init = function (rw) { if (typeof rw === 'string') { diff --git a/lib/adapters/sqlite3.js b/lib/adapters/sqlite3.js deleted file mode 100644 index 58d5a30b..00000000 --- a/lib/adapters/sqlite3.js +++ /dev/null @@ -1,409 +0,0 @@ -var safeRequire = require('../utils').safeRequire; - -/** - * Module dependencies - */ -var sqlite3 = safeRequire('sqlite3'); -var BaseSQL = require('../sql'); - -exports.initialize = function initializeSchema(schema, callback) { - if (!sqlite3) return; - var s = schema.settings; - var Database = sqlite3.verbose().Database; - var db = new Database(s.database); - - schema.client = db; - - schema.adapter = new SQLite3(schema.client); - if (s.database === ':memory:') { - schema.adapter.automigrate(callback); - } else { - process.nextTick(callback); - } -}; - -function SQLite3(client) { - this._models = {}; - this.client = client; -} - -require('util').inherits(SQLite3, BaseSQL); - -SQLite3.prototype.command = function () { - this.query('run', [].slice.call(arguments)); -}; - -SQLite3.prototype.queryAll = function () { - this.query('all', [].slice.call(arguments)); -}; - -SQLite3.prototype.queryOne = function () { - this.query('get', [].slice.call(arguments)); -}; - -SQLite3.prototype.query = function (method, args) { - var time = Date.now(); - var log = this.log; - var cb = args.pop(); - if (typeof cb === 'function') { - args.push(function (err, data) { - if (log) log(args[0], time); - cb.call(this, err, data); - }); - } else { - args.push(cb); - args.push(function (err, data) { - log(args[0], time); - }); - } - this.client[method].apply(this.client, args); -}; - -SQLite3.prototype.save = function (model, data, callback) { - var queryParams = []; - var sql = 'UPDATE ' + this.tableEscaped(model) + ' SET ' + - Object.keys(data).map(function (key) { - queryParams.push(data[key]); - return key + ' = ?'; - }).join(', ') + ' WHERE id = ' + data.id; - - this.command(sql, queryParams, function (err) { - callback(err); - }); -}; - -/** - * Must invoke callback(err, id) - */ -SQLite3.prototype.create = function (model, data, callback) { - data = data || {}; - var questions = []; - var values = Object.keys(data).map(function (key) { - questions.push('?'); - return data[key]; - }); - var sql = 'INSERT INTO ' + this.tableEscaped(model) + ' (' + Object.keys(data).join(',') + ') VALUES (' - sql += questions.join(','); - sql += ')'; - this.command(sql, values, function (err) { - callback(err, this && this.lastID); - }); -}; - -SQLite3.prototype.updateOrCreate = function (model, data, callback) { - data = data || {}; - var questions = []; - var values = Object.keys(data).map(function (key) { - questions.push('?'); - return data[key]; - }); - var sql = 'INSERT OR REPLACE INTO ' + this.tableEscaped(model) + ' (' + Object.keys(data).join(',') + ') VALUES (' - sql += questions.join(','); - sql += ')'; - this.command(sql, values, function (err) { - if (!err && this) { - data.id = this.lastID; - } - callback(err, data); - }); -}; - -SQLite3.prototype.toFields = function (model, data) { - 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])); - } - }.bind(this)); - return fields.join(','); -}; - -function dateToMysql(val) { - return val.getUTCFullYear() + '-' + - fillZeros(val.getUTCMonth() + 1) + '-' + - fillZeros(val.getUTCDate()) + ' ' + - fillZeros(val.getUTCHours()) + ':' + - fillZeros(val.getUTCMinutes()) + ':' + - fillZeros(val.getUTCSeconds()); - - function fillZeros(v) { - return v < 10 ? '0' + v : v; - } -} - -SQLite3.prototype.toDatabase = function (prop, val) { - if (!prop) return val; - if (prop.type.name === 'Number') return val; - if (val === null) return 'NULL'; - if (prop.type.name === 'Date') { - if (!val) return 'NULL'; - if (!val.toUTCString) { - val = new Date(val); - } - return val; - } - if (prop.type.name == "Boolean") return val ? 1 : 0; - return val.toString(); -}; - -SQLite3.prototype.fromDatabase = function (model, 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 = new Date(parseInt(val)); - } - } - data[key] = val; - }); - return data; -}; - -SQLite3.prototype.escapeName = function (name) { - return '`' + name + '`'; -}; - -SQLite3.prototype.exists = function (model, id, callback) { - var sql = 'SELECT 1 FROM ' + this.tableEscaped(model) + ' WHERE id = ' + id + ' LIMIT 1'; - this.queryOne(sql, function (err, data) { - if (err) return callback(err); - callback(null, data && data['1'] === 1); - }); -}; - -SQLite3.prototype.find = function find(model, id, callback) { - var sql = 'SELECT * FROM ' + this.tableEscaped(model) + ' WHERE id = ' + id + ' LIMIT 1'; - this.queryOne(sql, function (err, data) { - if (data) { - data.id = id; - } else { - data = null; - } - callback(err, this.fromDatabase(model, data)); - }.bind(this)); -}; - -SQLite3.prototype.all = function all(model, filter, callback) { - - var sql = 'SELECT * FROM ' + this.tableEscaped(model); - var self = this; - var props = this._models[model].properties; - var queryParams = []; - - if (filter) { - - if (filter.where) { - sql += ' ' + buildWhere(filter.where); - } - - if (filter.order) { - sql += ' ' + buildOrderBy(filter.order); - } - - if (filter.limit) { - sql += ' ' + buildLimit(filter.limit, filter.offset || 0); - } - - } - - this.queryAll(sql, queryParams, function (err, data) { - if (err) { - return callback(err, []); - } - callback(null, data.map(function (obj) { - return self.fromDatabase(model, obj); - })); - }.bind(this)); - - return sql; - - function buildWhere(conds) { - var cs = []; - Object.keys(conds).forEach(function (key) { - var keyEscaped = '`' + key.replace(/\./g, '`.`') + '`' - if (conds[key] === null) { - cs.push(keyEscaped + ' IS NULL'); - } else if (conds[key].constructor.name === 'Object') { - var condType = Object.keys(conds[key])[0]; - var sqlCond = keyEscaped; - switch (condType) { - case 'gt': - sqlCond += ' > '; - break; - case 'gte': - sqlCond += ' >= '; - break; - case 'lt': - sqlCond += ' < '; - break; - case 'lte': - sqlCond += ' <= '; - break; - case 'between': - sqlCond += ' BETWEEN ? AND ?'; - queryParams.push(conds[key][condType][0]); - queryParams.push(conds[key][condType][1]); - break; - } - if (condType !== 'between') { - sqlCond += '?'; - queryParams.push(conds[key][condType]); - } - cs.push(sqlCond); - } else { - cs.push(keyEscaped + ' = ?'); - queryParams.push(self.toDatabase(props[key], conds[key])); - } - }); - return 'WHERE ' + cs.join(' AND '); - } - - function buildOrderBy(order) { - if (typeof order === 'string') order = [order]; - return 'ORDER BY ' + order.join(', '); - } - - function buildLimit(limit, offset) { - return 'LIMIT ' + (offset ? (offset + ', ' + limit) : limit); - } - -}; - -SQLite3.prototype.count = function count(model, callback, where) { - var self = this; - var props = this._models[model].properties; - var queryParams = []; - - this.queryOne('SELECT count(*) as cnt FROM ' + - this.tableEscaped(model) + ' ' + buildWhere(where), queryParams, function (err, res) { - if (err) return callback(err); - callback(err, err ? null : res.cnt); - }); - - function buildWhere(conds) { - var cs = []; - Object.keys(conds || {}).forEach(function (key) { - var keyEscaped = '`' + key.replace(/\./g, '`.`') + '`' - if (conds[key] === null) { - cs.push(keyEscaped + ' IS NULL'); - } else { - cs.push(keyEscaped + ' = ?'); - queryParams.push(self.toDatabase(props[key], conds[key])); - } - }); - return cs.length ? ' WHERE ' + cs.join(' AND ') : ''; - } -}; - -SQLite3.prototype.disconnect = function disconnect() { - this.client.close(); -}; - -SQLite3.prototype.autoupdate = function (cb) { - var self = this; - var wait = 0; - Object.keys(this._models).forEach(function (model) { - wait += 1; - self.queryAll('SHOW FIELDS FROM ' + this.tableEscaped(model), function (err, fields) { - self.alterTable(model, fields, done); - }); - }); - - function done(err) { - if (err) { - console.log(err); - } - if (--wait === 0 && cb) { - cb(); - } - } -}; - -SQLite3.prototype.alterTable = function (model, actualFields, done) { - var self = this; - var m = this._models[model]; - var propNames = Object.keys(m.properties); - var sql = []; - - // change/add new fields - propNames.forEach(function (propName) { - if (propName === 'id') return; - var found; - actualFields.forEach(function (f) { - if (f.Field === propName) { - found = f; - } - }); - - if (found) { - actualize(propName, found); - } else { - 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') return; - if (notFound || !m.properties[f.Field]) { - sql.push('DROP COLUMN `' + f.Field + '`'); - } - }); - - if (sql.length) { - this.command('ALTER TABLE ' + this.tableEscaped(model) + ' ' + sql.join(',\n'), done); - } else { - done(); - } - - function actualize(propName, oldSettings) { - var newSettings = m.properties[propName]; - if (newSettings && changed(newSettings, oldSettings)) { - sql.push('CHANGE COLUMN `' + propName + '` `' + propName + '` ' + self.propertySettingsSQL(model, propName)); - } - } - - function changed(newSettings, oldSettings) { - if (oldSettings.Null === 'YES' && (newSettings.allowNull === false || newSettings.null === false)) return true; - if (oldSettings.Null === 'NO' && !(newSettings.allowNull === false || newSettings.null === false)) return true; - if (oldSettings.Type.toUpperCase() !== datatype(newSettings)) return true; - return false; - } -}; - -SQLite3.prototype.propertiesSQL = function (model) { - var self = this; - var sql = ['`id` INTEGER PRIMARY KEY']; - Object.keys(this._models[model].properties).forEach(function (prop) { - if (prop === 'id') return; - sql.push('`' + prop + '` ' + self.propertySettingsSQL(model, prop)); - }); - return sql.join(',\n '); - -}; - -SQLite3.prototype.propertySettingsSQL = function (model, prop) { - var p = this._models[model].properties[prop]; - return datatype(p) + ' ' + - (p.allowNull === false || p['null'] === false ? 'NOT NULL' : 'NULL'); -}; - -function datatype(p) { - switch (p.type.name) { - case 'String': - return 'VARCHAR(' + (p.limit || 255) + ')'; - case 'Text': - return 'TEXT'; - case 'Number': - return 'INT(11)'; - case 'Date': - return 'DATETIME'; - case 'Boolean': - return 'TINYINT(1)'; - } -} - diff --git a/package.json b/package.json index ac0de152..8051de3d 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,7 @@ "node >= 0.4.12" ], "dependencies": { - "node-uuid": ">= 1.3.3", - "lodash": "1.x.x" + "node-uuid": ">= 1.3.3" }, "devDependencies": { "semicov": "*",