alchemy 0.0.7 → 0.1.1

package/sql/SqlStatement.js

@@ -1,80 +0,0 @@
-'use strict'
-
-var jsesc = require('jsesc')
-var classy = require('classy')
-var Promise = require('bluebird')
-var getEngine = require('../defaultEngine')
-
-
-var SqlStatement = classy.define({
-
-	extend: require('./SqlBase'),
-	alias : 'sql.Statement',
-
-	stateProperties: [
-		'name',
-		'parameterized'
-	],
-
-	parameterized: true,
-
-	initState: function(){
-		this.callSuper()
-		this.state.name = this.name
-	},
-
-	isParameterized: function(){
-		return !!this.parameterized
-	},
-
-	isPrepared: function(){
-		return this.isParameterized() && this.name
-	},
-
-	getParams: function(){
-		return []
-	},
-
-	valueToSql: function(str){
-		var result = str
-
-		if (this && this.isParameterized && !this.isParameterized() && typeof str == 'string'){
-			result = "'" + jsesc(str) + "'"
-		}
-
-		if (str instanceof SqlStatement){
-			str = '(' + str + ')'
-		}
-
-		if (result == null){
-			result = 'null'
-		}
-
-		return result
-	},
-
-	transact: function(){
-		return this.execute({
-			transaction: true
-		})
-	},
-
-	execute: function(config){
-
-		var transaction = (config && config.transaction) || this.transactional
-
-		return new Promise(function(resolve, reject){
-
-			var engine = getEngine()
-			var exec   = (transaction? engine.transaction: engine.query).bind(engine)
-
-			exec(this, function(err, result){
-				err?
-					reject(err):
-					resolve(result)
-			})
-		}.bind(this))
-	}
-})
-
-module.exports = SqlStatement

package/sql/Table.js

@@ -1,96 +0,0 @@
-var classy = require('classy')
-var Promise = require('bluebird')
-var F = require('functionally')
-
-var defineElement = require('./defineElement')
-
-var Create = require('./Create')
-var Select = require('./Select')
-var Insert = require('./Insert')
-var Update = require('./Update')
-var Delete = require('./Delete')
-
-module.exports = defineElement('table', {
-
-	mixins: [
-		require('./Columnable')
-	],
-
-	statics: {
-		fromState: function(state){
-			var Column  = require('./Column')
-			var columns = state.columns.map(Column.fromState)
-
-			new this(state.name, null, columns)
-		}
-	},
-
-	appendStateProperties: function(props){
-	    props.push('metadata')
-	},
-
-	init: function(name, metadata, columns){
-
-		this.callSuper()
-
-		this.c = {}
-
-		this.name = this.validate(name || '')
-		if (this.name == 'user'){
-			this.name = '"user"'
-		}
-
-		this.prepareColumns.apply(this, [].slice.call(arguments, 2))
-		this.metadata = metadata
-
-	},
-
-	prepareColumns: function(){
-		this.columns.forEach(function(col){
-			col.setTable(this)
-			this.c[col.name] = col
-		}, this)
-	},
-
-	toString: function(){
-		return this.createToString()
-	},
-
-	createToString: function () {
-		var cmd = 'CREATE TABLE IF NOT EXISTS ' + this.name + ' ('
-
-		cmd += (this.columns || []).map(function(c){
-			return c.asCreate()
-		}).join(', ')
-
-		return cmd + ');'
-	},
-
-	create: function(){
-		return Create(this)
-	},
-
-	select: function(){
-		var columns
-
-		if (!arguments.length){
-			columns = (columns || []).slice()
-		} else {
-			columns = [].slice.call(arguments, 0)
-		}
-
-		return Select(columns).from(this)
-	},
-
-	delete: function(){
-		return Delete(this)
-	},
-
-	insert: function(){
-		return Insert(this.columns.slice())
-	},
-
-	update: function(){
-		return Update(this.columns.slice())
-	}
-})

package/sql/Transaction.js

@@ -1,45 +0,0 @@
-'use strict'
-
-var Promise = require('bluebird')
-var classy  = require('classy')
-var getEngine = require('../defaultEngine')
-
-module.exports = classy.define({
-
-	extend: require('./SqlStatement'),
-	alias : 'sql.Transaction',
-
-	init: function(){
-		this.statements = [].slice.call(arguments, 0)
-	},
-
-	add: function(){
-		this.statements = this.statements.concat([].slice.call(arguments, 0))
-	},
-
-	toString: function(){
-		return this.valueOf()
-	},
-
-	valueOf: function(config){
-		return 'BEGIN; ' + this.statements.map(function(s){ return s.valueOf() })
-	},
-
-	execute: function(config){
-
-		var statements = this.statements.filter(function(s){
-			return !!s
-		})
-
-		return new Promise(function(resolve, reject){
-
-			getEngine()
-				.transaction(statements, function(err, results){
-					err?
-						reject(err):
-						resolve(results)
-				})
-
-		}.bind(this))
-	}
-})

package/sql/Update.js

@@ -1,105 +0,0 @@
-var jsesc = require('jsesc')
-
-module.exports = require('./defineStatement')('udate', {
-
-	extend: 'insert',
-
-	toString: function(){
-		var target = this.targetToString()
-		var cols = this.columnsToString()
-		var values = this.valuesToString()
-
-		return 'UPDATE ' + target + ' SET ' + cols + ' VALUES ' + values + ';'
-	},
-
-	getInsertColumns: function(){
-		var cols = []
-
-		this.values.forEach(function(values){
-			Object.keys(values).forEach(function(k){
-				if (!~cols.indexOf(k)){
-					cols.push(k)
-				}
-			})
-		})
-
-		return cols
-	},
-
-	valuesToString: function(){
-		var cols = this.getInsertColumns()
-
-		return this.values.map(function(values){
-
-			var result = cols.map(function(colName){
-				return this.valueToString(values[colName])
-			}, this)
-
-			return '(' + result.join(', ') + ')'
-		}, this).join(', ')
-	},
-
-	columnsToString: function(){
-		return '(' + this.getInsertColumns().join(', ') + ')'
-	},
-
-	valueToString: function(str){
-		var result = str
-
-		if (typeof str == 'string'){
-			result = "'" + jsesc(str) + "'"
-		}
-
-		if (result == null){
-			result = 'null'
-		}
-
-		return result
-	},
-
-	intoToString: function() {
-		var into = this.intoTarget
-
-		if (!into){
-			this.columns.some(function(c){
-				if (c.table.name){
-					into = c.table.name
-					return true
-				}
-			})
-		}
-
-		return into
-	},
-
-	values: function(values){
-		this.values = Array.isArray(values)?
-							values:
-							[values]
-
-		var cols = {}
-		this.columns.forEach(function(col){
-			cols[col.name] = 1
-		})
-
-		this.values = this.values.map(function(values){
-			var validValues = {}
-			var count = 0
-
-			Object.keys(values).forEach(function(k){
-				if (k in cols){
-					validValues[k] = values[k]
-					count++
-				}
-			})
-
-			return count? validValues: null
-		})
-
-		this.values = this.values.filter(function(v){
-			return !!v
-		})
-
-		return this
-	}
-})

package/sql/defineElement.js

@@ -1,26 +0,0 @@
-'use strict'
-
-var SchemaElement   = require('./SchemaElement')
-var classy       = require('classy')
-var toUpperFirst = require('ustring').toUpperFirst
-
-module.exports = function(type, config){
-
-    if (arguments.length < 2){
-        return console.error('Please provide a type for the SchemaElement!')
-    }
-
-    config = config || {}
-
-    var extend = config.extend
-
-    if (typeof extend == 'string'){
-        extend = require('./' + toUpperFirst(extend))
-    }
-
-    config.extend = extend || SchemaElement
-    config.alias  = config.alias  || 'schema.' + toUpperFirst(type)
-    config.schemaType   = type
-
-    return classy.define(config)
-}

package/sql/defineStatement.js

@@ -1,26 +0,0 @@
-'use strict'
-
-var SqlStatement = require('./SqlStatement')
-var classy       = require('classy')
-var toUpperFirst = require('ustring').toUpperFirst
-
-module.exports = function(name, config){
-
-    if (arguments.length < 2){
-        return console.error('Please provide a name for the SqlStatement!')
-    }
-
-    config = config || {}
-
-    var extend = config.extend
-
-    if (typeof extend == 'string'){
-        extend = require('./' + toUpperFirst(extend))
-    }
-
-    config.extend = extend || SqlStatement
-    config.alias  = config.alias  || 'sql.' + toUpperFirst(name)
-    config.name   = name
-
-    return classy.define(config)
-}

package/sql/types/BaseType.js

@@ -1,43 +0,0 @@
-'use strict'
-
-var classy = require('classy')
-
-var Type = classy.define({
-
-    alias : 'sql.BaseType',
-    extend: require('../SqlBase'),
-
-    statics: {
-
-        fromState: function(state){
-            var result = new this()
-
-            result.copy(state)
-
-            return result
-        },
-
-        toString: function(){
-            return this.prototype.type
-        },
-
-        toJSON: function(){
-            return {
-                type: this.toString()
-            }
-        }
-    },
-
-    toString: function(){
-        return this.type
-    },
-
-    toJSON: function(){
-        return {
-            type : this.type,
-            value: this.toString()
-        }
-    }
-})
-
-module.exports = Type

package/sql/types/BigSerialType.js

@@ -1,5 +0,0 @@
-'use strict'
-
-module.exports = require('./defineType')({
-    type: 'bigserial'
-})

package/sql/types/IntegerType.js

@@ -1,5 +0,0 @@
-var defineType = require('./defineType')
-
-module.exports = defineType({
-    type: 'integer'
-})

package/sql/types/JsonType.js

@@ -1,5 +0,0 @@
-var defineType = require('./defineType')
-
-module.exports = defineType({
-    type: 'json'
-})

package/sql/types/SerialType.js

@@ -1,5 +0,0 @@
-var defineType = require('./defineType')
-
-module.exports = defineType({
-    type: 'serial'
-})

package/sql/types/StringType.js

@@ -1,31 +0,0 @@
-var defineType = require('./defineType')
-
-module.exports = defineType({
-
-    type: 'string',
-
-    statics: {
-        displayName: 'StringType',
-        defaultLength: 50,
-        toString: function(){
-            return 'varchar(' + StringType.defaultLength + ')'
-        }
-    },
-
-    init: function(len){
-        this.len = len
-    },
-
-    toString: function(){
-        return 'varchar(' + this.len + ')'
-    },
-
-    toJSON: function(){
-        var json = this.callSuper()
-
-        json.len = this.len
-
-        return json
-    }
-
-})

package/sql/types/TimestampType.js

@@ -1,5 +0,0 @@
-var defineType = require('./defineType')
-
-module.exports = defineType({
-    type: 'timestamp'
-})

package/sql/types/UUIDType.js

@@ -1,5 +0,0 @@
-var defineType = require('./defineType')
-
-module.exports = defineType({
-    type: 'uuid'
-})

package/sql/types/defineType.js

@@ -1,25 +0,0 @@
-'use strict'
-
-var classy       = require('classy')
-var toUpperFirst = require('ustring').toUpperFirst
-var Type         = require('./BaseType')
-
-function define(config){
-    config = config || {}
-
-    config.extend = config.extend || Type
-    config.alias  = 'sql.' + toUpperFirst(config.type)
-
-    var NewType = classy.define(config)
-
-    if (!config.statics || !config.statics.toString){
-        NewType.toString = NewType.$superClass.toString
-    }
-    if (!config.statics || !config.statics.toJSON){
-        NewType.toJSON = NewType.$superClass.toJSON
-    }
-
-    return NewType
-}
-
-module.exports = define

package/sql/types/getType.js

@@ -1,12 +0,0 @@
-var toUpperFirst = require('ustring').toUpperFirst
-var F            = require('functionally')
-var find         = F.find
-var types        = require('./index')
-
-var equals = F.curry(function(t, type){
-    return t === type.prototype.type
-})
-
-module.exports = function(json){
-    return find(equals(json.type), types)
-}

package/sql/types/index.js

@@ -1,11 +0,0 @@
-//just add new types here as you need them
-
-module.exports = {
-    String   : require('./StringType'),
-    Integer  : require('./IntegerType'),
-    Serial   : require('./SerialType'),		//serial integer up to 2^31
-    BigSerial: require('./BigSerialType'), 	//serial big integer
-    Json     : require('./JsonType'),
-    UUID     : require('./UUIDType'),
-    Timestamp: require('./TimestampType')
-}

package/sql/where.js

@@ -1,31 +0,0 @@
-var F               = require('functionally')
-
-module.exports = function(column){
-    var self = this
-    this.whereConditions = this.whereConditions || []
-
-    var thisWhere    = this.where.bind(this)
-    var thisToString = this.toString.bind(this)
-
-    var all  = this.whereConditions
-
-    var push = F.curry(function(operator, value, options){
-        all.push([column, operator, value, options || {} ])
-
-        return {
-            and: thisWhere,
-            toString: thisToString,
-            end: function(){
-                return self
-            }
-        }
-    }, 2)
-
-    return {
-        equals: push('='),
-        is: push('='),
-        lt: push('<'),
-        gt: push('>'),
-        in: push(' in ')
-    }
-}

package/sql/whereToString.js

@@ -1,29 +0,0 @@
-module.exports = function(config) {
-    config = config || {}
-
-    var parameterized = config.parameterized === undefined?
-                            this.parameterized:
-                            config.parameterized
-    var where = ''
-
-    if (this.whereConditions && this.whereConditions.length){
-        where = this.whereConditions.map(function(cond, i){
-            var col      = cond[0]
-            var colName  = typeof col == 'string'? col: col.name
-            var operator = cond[1]
-            var value    = cond[2]
-
-            var result = colName + ' ' + operator + ' '
-            var type = cond[3].type
-            var options = type? '::' + type: ''
-
-            return parameterized?
-                        result + '$' + (i + 1) + options:
-                        result + this.valueToSql(value) + options
-        }, this).join(' AND ')
-
-        where = ' WHERE ' + where
-    }
-
-    return where
-}

package/test/ColumnTests.js

@@ -1,80 +0,0 @@
-var Column = require('../Column')
-var Types  = require('../Types')
-
-describe('Column', function(){
-
-	it('should have name set', function(){
-		var col = Column('firstName', Types.String)
-
-		col.name
-			.should.equal('firstName')
-
-		col.state.name
-			.should
-			.equal(col.name)
-
-		col.state.name
-			.should.equal('firstName')
-
-	})
-
-	it('should return state correctly', function(){
-		var col = Column('firstName', Types.String(35), { primaryKey: true})
-
-		var state = col.toState()
-
-		state.type.type
-			.should
-			.equal('string')
-
-		state.type.value
-			.should
-			.equal('varchar(35)')
-
-		state.name
-			.should
-			.equal('firstName')
-
-		state.options.primaryKey
-			.should
-			.equal(true)
-	})
-
-	it('should return valid column from fromState', function(){
-		var col1 = Column('lastName', Types.String(35), { primaryKey: true})
-
-		var col2 = Column.fromState(col1.toState())
-
-		JSON.stringify(col1.toState())
-			.should
-			.equal(
-				JSON.stringify(col2.toState())
-			)
-	})
-
-	it('should validate type correctly', function(){
-		Column('name', Types.String)
-			.isValidType()
-			.should.equal(true)
-
-		new Column('name', Types.String)
-			.isValidType()
-			.should.equal(true)
-
-		Column('name', Types.String(50))
-			.isValidType()
-			.should.equal(true)
-
-		Column('name', Types.XXX)
-			.isValidType()
-			.should.equal(false)
-	})
-
-	it('should be instantiated correctly', function(){
-		var bool = Column('name') instanceof Column
-		bool.should.equal(true)
-
-		bool = new Column('name') instanceof Column
-		bool.should.equal(true)
-	})
-})