@@ -134,6 +134,13 @@ describe("Finders", { }, "count": function() { value_of(Person.count()).should_be(5); + }, + "Finding with columns hash for conditions": function() { + value_of(Person.find({conditions:{name: "Nick"}}).id).should_be(1); + value_of(Person.find({conditions:{name: "Karen", age: 30}}).id).should_be(4); + }, + "Finding with arbitrary comparison operators for conditions": function() { + value_of(Person.find({conditions:{age: ["<", 24]}}).name).should_be("David"); } }); @@ -195,10 +202,10 @@ describe("Updating and destroying from Model", { value_of(p.errors).should_include("age"); }, "Updating all records": function() { - Person.updateAll({name: "Bob"}); + Person.updateAll({name: "Juan"}); var people = Person.all(); JazzRecord.each(people, function(record, index) { - value_of(record.name).should_be("Bob"); + value_of(record.name).should_be("Juan"); }); }, "Updating all records conditionally": function() { @@ -215,7 +222,7 @@ describe("Updating and destroying from Model", { var people = [1,2,3]; Person.destroy(people); JazzRecord.each(people, function(id, index) { - value_of(id).should_be_null(); + value_of(Person.find(id)).should_be_null(); }); }, "Destroying all records": function() { @@ -226,6 +233,6 @@ describe("Updating and destroying from Model", { "Destroying all records conditionally": function() { value_of(Animal.count()).should_be(5); Animal.destroyAll({say: "rawr!"}); - value_of(Animal.count()).should_be(5); + value_of(Animal.count()).should_be(3); } }); \ No newline at end of file JSSpec/specs/model.js @@ -32,7 +32,6 @@ // JazzRecord.adapter = new JazzRecord.TitaniumAdapter({dbFile: "test.db"}); // JazzRecord.adapter = new JazzRecord.HTML5Adapter({dbFile: "test.db"}); JazzRecord.adapter = new JazzRecord.GearsAdapter({dbFile: "test.db"}); - JazzRecord.debug = true; JazzRecord.migrations = migrations; JazzRecord.fixtures = fixtures; JazzRecord.migrate({refresh:true}); index.html @@ -1,4 +1,5 @@ -JazzRecord.Model.prototype.destroy = function(id) { +// no callbacks, more efficient +JazzRecord.Model.prototype.deleteRecords = function(id) { var conditions = ""; if(JazzRecord.getType(id) === 'number') conditions = "WHERE id=" + id; @@ -8,12 +9,36 @@ JazzRecord.Model.prototype.destroy = function(id) { this.query(); }; -JazzRecord.Model.prototype.destroyAll = function() { +// no callbacks, more efficient +JazzRecord.Model.prototype.deleteAll = function(conditions) { this.sql = "DELETE FROM " + this.table; + if(conditions) + this.sql += " WHERE " + conditions; this.query(); }; JazzRecord.Model.prototype.dropTable = function() { - this.sql = "DROP TABLE IF EXISTS " + this.table; - this.query(); + this.sql = "DROP TABLE IF EXISTS " + this.table; + this.query(); +}; + +// callbacks +JazzRecord.Model.prototype.destroy = function(ids) { + var records = this.find(ids); + if(JazzRecord.getType(records) === "array") { + JazzRecord.each(records, function(rec, index) { + rec.destroy(); + }); + return records; + } + else { + records.destroy(); + } }; + +JazzRecord.Model.prototype.destroyAll = function(conditions) { + var records = this.all({conditions: conditions}); + JazzRecord.each(records, function(rec, index) { + rec.destroy(); + }); +}; \ No newline at end of file javascripts/model/destroy.js @@ -11,6 +11,7 @@ JazzRecord.Model.prototype.find = function(options) { options = {id: options, limit: 1}; break; case "object": + options.limit = 1; break; default: throw("Type Error. Model.find() expects Number, Array or Object"); @@ -63,6 +64,8 @@ JazzRecord.Model.prototype.select = function(options) { options = JazzRecord.shallowMerge(defaultOptions, options); + console.log(options); + if(options.select.indexOf("id") === -1 && options.select.indexOf("*") === -1) options.select = "id, " + options.select; if(options.order || this.options.order) { @@ -80,9 +83,40 @@ JazzRecord.Model.prototype.select = function(options) { //add complex conditions handling as in AR if(options.conditions) { - options.conditions = "WHERE " + options.conditions; - if(options.id) - options.conditions += " AND id=" + options.id; + var conditionSql = "WHERE "; + // // simple string + if(JazzRecord.getType(options.conditions) === "string") { + options.conditions = conditionSql + options.conditions; + if(options.id) + options.conditions += " AND id=" + options.id; + } + else { + // obj hash of cols/values + JazzRecord.each(this.options.columns, function(colType, colName) { + var conditionCol = options.conditions[colName]; + if(conditionCol) { + var conditionType = JazzRecord.getType(conditionCol); + switch(conditionType) { + // equality + case "string": + conditionSql += (colName + "='" + conditionCol.replace(/'/g, "''") + "' AND "); + break; + // arbitrary comparison operator, comparison value + case "array": + conditionSql += colName + " " + conditionCol[0] + " "; + if(JazzRecord.getType(conditionCol[1]) === "string") + conditionSql += (conditionCol[1].replace(/'/g, "''") + " AND "); + else + conditionSql += conditionCol[1] + " AND "; + break; + default: + conditionSql += (colName + "=" + conditionCol + " AND "); + break; + } + } + }); + options.conditions = conditionSql.slice(0, -4); + } } else if(options.id) { if(JazzRecord.getType(options.id)=='number') { javascripts/model/find.js @@ -74,20 +74,30 @@ JazzRecord.Model.prototype = { // update methods enforce validation // options is hash of col/values, id is single ID or array // returns modified record object whether passed or failed validation if single ID - update: function(ids, options) { - + update: function(ids, updates) { + var records = this.find(ids); + if(JazzRecord.getType(records) === "array") { + JazzRecord.each(records, function(rec, index) { + rec.updateAttributes(updates[index]); + }); + return records; + } + else { + records.updateAttributes(updates); + return records; + } }, // updates is hash of col/values // conditions should be abstracted out // does not validate updateAll: function(updates, conditions, options) { - - }, - // selector is ID or array of IDs - destroy: function(ids) { - - }, - destroyAll: function(conditions) { - + if(!JazzRecord.isDefined(options)) + options = {}; + if(JazzRecord.isDefined(conditions)) + options = JazzRecord.shallowMerge(options, {conditions: conditions}); + var records = this.all(options); + JazzRecord.each(records, function(rec, index) { + rec.updateAttributes(updates); + }); } }; javascripts/model/model.js @@ -61,7 +61,7 @@ JazzRecord.Record.prototype = { if(!this.id) throw("Unsaved record cannot be destroyed"); else { - this.options.model.destroy(this.id); + this.options.model.deleteRecords(this.id); // unlink any hasMany and hasOne records from this record JazzRecord.each(this.options.model.options.hasMany, function(assocTable, assoc) { this.load(assoc); javascripts/record/record.js b7261e9720e7ca997594c19f48849bcbdb21de47 Nick Carter thynctank@thynctank.com http://github.com/thynctank/jazzrecord/commit/11f8f18f41dfbf303a121a17fa31f35771ef2f33 11f8f18f41dfbf303a121a17fa31f35771ef2f33 2009-08-26T02:12:18-07:00 2009-08-26T02:12:18-07:00 all tests passing, arbitrary comparison operators in conditions option for finders/conditions hashes ebe622becb40cfedb5372139eb1b502a68474dfc Nick Carter thynctank@thynctank.com