Merge transactions

Makefile

@@ -56,20 +56,22 @@ about-docs:
 GITBRANCH = $(shell git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
 
 REPO = marcusgreenwood/hatchjs
+TARGET = origin
 FROM = $(GITBRANCH)
 TO = $(GITBRANCH)
 
 pull:
-	git pull origin $(FROM)
+	git pull $(TARGET) $(FROM)
 
 safe-pull:
-	git pull origin $(FROM) --no-commit
+	git pull $(TARGET) $(FROM) --no-commit
 
 push: test
-	git push origin $(TO)
+	git push $(TARGET) $(TO)
 
 feature:
 	git checkout -b feature-$(filter-out $@,$(MAKECMDGOALS))
+	git push -u $(TARGET) feature-$(filter-out $@,$(MAKECMDGOALS))
 %:
 	@:
 

docs/roadmap.md

@@ -19,6 +19,8 @@ jugglingdb-roadmap - The Future of JugglingDB
 
 ## MODEL CORE
 
+* schema switching
+* common transaction support
 * virtual attributes
 * object presentation modes
 * mass-assignment protection

lib/adapters/memory.js

@@ -1,14 +1,30 @@
 exports.initialize = function initializeSchema(schema, callback) {
     schema.adapter = new Memory();
-    process.nextTick(callback);
+    schema.adapter.connect(callback);
 };
 
-function Memory() {
-    this._models = {};
+function Memory(m) {
+    if (m) {
+        this.isTransaction = true;
+        this.cache = m.cache;
+        this.ids = m.ids;
+        this._models = m._models;
+    } else {
+        this.isTransaction = false;
         this.cache = {};
         this.ids = {};
+        this._models = {};
+    }
 }
 
+Memory.prototype.connect = function(callback) {
+    if (this.isTransaction) {
+        this.onTransactionExec = callback;
+    } else {
+        process.nextTick(callback);
+    }
+};
+
 Memory.prototype.define = function defineModel(descr) {
     var m = descr.model.modelName;
     this._models[m] = descr;
@@ -20,7 +36,7 @@ Memory.prototype.create = function create(model, data, callback) {
     var id = data.id || this.ids[model]++;
     data.id = id;
     this.cache[model][id] = JSON.stringify(data);
-    process.nextTick(function () {
+    process.nextTick(function() {
         callback(null, id);
     });
 };
@@ -185,6 +201,15 @@ Memory.prototype.updateAttributes = function updateAttributes(model, id, data, c
     this.save(model, merge(base, data), cb);
 };
 
+Memory.prototype.transaction = function () {
+    return new Memory(this);
+};
+
+Memory.prototype.exec = function(callback) {
+    this.onTransactionExec();
+    setTimeout(callback, 50);
+};
+
 function merge(base, update) {
     if (!base) return update;
     Object.keys(update).forEach(function (key) {

lib/model.js

@@ -174,23 +174,29 @@ AbstractClass.create = function (data, callback) {
         callback = function () {};
     }
 
+    if (!data) {
+        data = {};
+    }
+
     if (data instanceof Array) {
         var instances = [];
-        var errors = new Array(data.length);
+        var errors = Array(data.length);
         var gotError = false;
         var wait = data.length;
         if (wait === 0) callback(null, []);
 
-        var instances = data.map(function(d, i) {
-            return Model.create(d, function(err, inst) {
-                // console.log('got', i, err, inst, inst.errors);
+        var instances = [];
+        for (var i = 0; i < data.length; i += 1) {
+            (function(d, i) {
+                instances.push(Model.create(d, function(err, inst) {
                     if (err) {
                         errors[i] = err;
                         gotError = true;
                     }
                     modelCreated();
-            });
-        });
+                }));
+            })(data[i], i);
+        }
 
         return instances;
 
@@ -252,6 +258,9 @@ AbstractClass.create = function (data, callback) {
 
 function stillConnecting(schema, obj, args) {
     if (schema.connected) return false;
+    if (!schema.connecting) {
+        schema.connect();
+    }
     var method = args.callee;
     schema.on('connected', function () {
         method.apply(obj, [].slice.call(args));
@@ -697,7 +706,7 @@ AbstractClass.prototype.isNewRecord = function () {
  * @private
  */
 AbstractClass.prototype._adapter = function () {
-    return this.constructor.schema.adapter;
+    return this.schema.adapter;
 };
 
 /**

lib/schema.js

@@ -2,6 +2,7 @@
  * Module dependencies
  */
 var AbstractClass = require('./model.js').AbstractClass;
+var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var path = require('path');
 var fs = require('fs');
@@ -65,6 +66,7 @@ function Schema(name, settings) {
 
     // Disconnected by default
     this.connected = false;
+    this.connecting = true;
 
     // create blank models pool
     this.models = {};
@@ -115,9 +117,24 @@ function Schema(name, settings) {
         this.emit('connected');
 
     }.bind(this));
+
+    schema.connect = function(cb) {
+        var schema = this;
+        schema.connecting = true;
+        schema.adapter.connect(function(err) {
+            if (!err) {
+                schema.connected = true;
+                schema.connecting = false;
+                schema.emit('connected');
+            }
+            if (cb) {
+                cb(err);
+            }
+        });
+    };
 };
 
-util.inherits(Schema, require('events').EventEmitter);
+util.inherits(Schema, EventEmitter);
 
 /**
  * Define class
@@ -160,20 +177,17 @@ Schema.prototype.define = function defineClass(className, properties, settings)
 
     settings = settings || {};
 
-    standartize(properties, settings);
-
     // every class can receive hash of data as optional param
-    var NewClass = function ModelConstructor(data) {
+    var NewClass = function ModelConstructor(data, schema) {
         if (!(this instanceof ModelConstructor)) {
             return new ModelConstructor(data);
         }
         AbstractClass.call(this, data);
+        this.schema = schema || this.constructor.schema;
     };
 
     hiddenProperty(NewClass, 'schema', schema);
     hiddenProperty(NewClass, 'modelName', className);
-    hiddenProperty(NewClass, 'cache', {});
-    hiddenProperty(NewClass, 'mru', []);
     hiddenProperty(NewClass, 'relations', {});
 
     // inherit AbstractClass methods
@@ -187,6 +201,8 @@ Schema.prototype.define = function defineClass(className, properties, settings)
     NewClass.getter = {};
     NewClass.setter = {};
 
+    standartize(properties, settings);
+
     // store class in model pool
     this.models[className] = NewClass;
     this.definitions[className] = {
@@ -194,7 +210,7 @@ Schema.prototype.define = function defineClass(className, properties, settings)
         settings: settings
     };
 
-    // pass controll to adapter
+    // pass control to adapter
     this.adapter.define({
         model:      NewClass,
         properties: properties,
@@ -251,7 +267,6 @@ Schema.prototype.define = function defineClass(className, properties, settings)
 
     return NewClass;
 
-
 };
 
     function standartize(properties, settings) {
@@ -269,6 +284,7 @@ Schema.prototype.define = function defineClass(className, properties, settings)
         // or {timestamps: {created: 'created_at', updated: false}}
         // by default property names: createdAt, updatedAt
     }
+
 /**
  * Define single property named `prop` on `model`
  *
@@ -416,6 +432,73 @@ Schema.prototype.disconnect = function disconnect(cb) {
     }
 };
 
+Schema.prototype.copyModel = function copyModel(Master) {
+    var schema = this;
+    var className = Master.modelName;
+    var md = Master.schema.definitions[className];
+    var Slave = function SlaveModel() {
+        Master.apply(this, [].slice.call(arguments));
+        this.schema = schema;
+    };
+
+    util.inherits(Slave, Master);
+
+    Slave.__proto__ = Master;
+
+    hiddenProperty(Slave, 'schema', schema);
+    hiddenProperty(Slave, 'modelName', className);
+    hiddenProperty(Slave, 'relations', Master.relations);
+
+    if (!(className in schema.models)) {
+
+        // store class in model pool
+        schema.models[className] = Slave;
+        schema.definitions[className] = {
+            properties: md.properties,
+            settings: md.settings
+        };
+
+        if (!schema.isTransaction) {
+            schema.adapter.define({
+                model:      Slave,
+                properties: md.properties,
+                settings:   md.settings
+            });
+        }
+
+    }
+
+    return Slave;
+};
+
+Schema.prototype.transaction = function() {
+    var schema = this;
+    var transaction = new EventEmitter;
+    transaction.isTransaction = true;
+    transaction.origin = schema;
+    transaction.name = schema.name;
+    transaction.settings = schema.settings;
+    transaction.connected = false;
+    transaction.connecting = false;
+    transaction.adapter = schema.adapter.transaction();
+
+    // create blank models pool
+    transaction.models = {};
+    transaction.definitions = {};
+
+    for (var i in schema.models) {
+        schema.copyModel.call(transaction, schema.models[i]);
+    }
+
+    transaction.connect = schema.connect;
+
+    transaction.exec = function(cb) {
+        transaction.adapter.exec(cb);
+    };
+
+    return transaction;
+};
+
 /**
  * Define hidden property
  */

test/schema.test.js

@@ -1,7 +1,11 @@
 var db = getSchema(), slave = getSchema(), Model, SlaveModel;
 var should = require('should');
 
+<<<<<<< HEAD
 describe.skip('schema', function() {
+=======
+describe.only('schema', function() {
+>>>>>>> feature-transactions
 
     it('should define Model', function() {
         Model = db.define('Model');