Skip to content
This repository has been archived by the owner on Dec 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #132 from doug-martin/master
Browse files Browse the repository at this point in the history 
v0.9.2
  • Loading branch information
@doug-martin
doug-martin committed Jan 23, 2015
2 parents 5ae8db4 + ff56e3a commit 65f4c19
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 66 deletions.
66 changes: 33 additions & 33 deletions docs-md/coverage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7283,14 +7283,14 @@
<li class='green'><span class=''> </span><code> * @borrows patio.Dataset#leftJoin as leftJoin</code></li>
<li class='green'><span class=''> </span><code> * */</code></li>
<li class='green'><span class=''> </span><code> constructor: function (options, fromDb) {</code></li>
<li class='green'><span class='hits'>2783</span><code> if (this.synced) {</code></li>
<li class='green'><span class='hits'>2783</span><code> this.__emitter = new EventEmitter();</code></li>
<li class='green'><span class='hits'>2783</span><code> this._super(arguments);</code></li>
<li class='green'><span class='hits'>2783</span><code> this.patio = patio || require("./index");</code></li>
<li class='green'><span class='hits'>2783</span><code> fromDb = isBoolean(fromDb) ? fromDb : false;</code></li>
<li class='green'><span class='hits'>2783</span><code> this.__changed = {};</code></li>
<li class='green'><span class='hits'>2783</span><code> this.__values = {};</code></li>
<li class='green'><span class='hits'>2783</span><code> if (fromDb) {</code></li>
<li class='green'><span class='hits'>2793</span><code> if (this.synced) {</code></li>
<li class='green'><span class='hits'>2793</span><code> this.__emitter = new EventEmitter();</code></li>
<li class='green'><span class='hits'>2793</span><code> this._super(arguments);</code></li>
<li class='green'><span class='hits'>2793</span><code> this.patio = patio || require("./index");</code></li>
<li class='green'><span class='hits'>2793</span><code> fromDb = isBoolean(fromDb) ? fromDb : false;</code></li>
<li class='green'><span class='hits'>2793</span><code> this.__changed = {};</code></li>
<li class='green'><span class='hits'>2793</span><code> this.__values = {};</code></li>
<li class='green'><span class='hits'>2793</span><code> if (fromDb) {</code></li>
<li class='green'><span class='hits'>1535</span><code> this._hook("pre", "load");</code></li>
<li class='green'><span class='hits'>1535</span><code> this.__isNew = false;</code></li>
<li class='green'><span class='hits'>1535</span><code> this.__setFromDb(options, true);</code></li>
Expand All @@ -7299,24 +7299,24 @@
<li class='green'><span class='hits'>1535</span><code> this._static.emit("load", this);</code></li>
<li class='green'><span class=''> </span><code> }</code></li>
<li class='green'><span class=''> </span><code> } else {</code></li>
<li class='green'><span class='hits'>1248</span><code> this.__isNew = true;</code></li>
<li class='green'><span class='hits'>1248</span><code> this.__set(options);</code></li>
<li class='green'><span class='hits'>1258</span><code> this.__isNew = true;</code></li>
<li class='green'><span class='hits'>1258</span><code> this.__set(options);</code></li>
<li class='green'><span class=''> </span><code> }</code></li>
<li class='green'><span class=''> </span><code> } else {</code></li>
<li class='red'><span class='nohits'>0</span><code> throw new ModelError("Model " + this.tableName + " has not been synced");</code></li>
<li class='green'><span class=''> </span><code> }</code></li>
<li class='green'><span class=''> </span><code> },</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> __set: function (values, ignore) {</code></li>
<li class='green'><span class='hits'>1372</span><code> values = values || {};</code></li>
<li class='green'><span class='hits'>1372</span><code> this.__ignore = ignore === true;</code></li>
<li class='green'><span class='hits'>1372</span><code> Object.keys(values).forEach(function (attribute) {</code></li>
<li class='green'><span class='hits'>1382</span><code> values = values || {};</code></li>
<li class='green'><span class='hits'>1382</span><code> this.__ignore = ignore === true;</code></li>
<li class='green'><span class='hits'>1382</span><code> Object.keys(values).forEach(function (attribute) {</code></li>
<li class='green'><span class='hits'>6019</span><code> var value = values[attribute];</code></li>
<li class='green'><span class=''> </span><code> //check if the column is a constrained value and is allowed to be set</code></li>
<li class='green'><span class='hits'>6019</span><code> !ignore &amp;&amp; this._checkIfColumnIsConstrained(attribute);</code></li>
<li class='green'><span class='hits'>6019</span><code> this[attribute] = value;</code></li>
<li class='green'><span class=''> </span><code> }, this);</code></li>
<li class='green'><span class='hits'>1372</span><code> this.__ignore = false;</code></li>
<li class='green'><span class='hits'>1382</span><code> this.__ignore = false;</code></li>
<li class='green'><span class=''> </span><code> },</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> __setFromDb: function (values, ignore) {</code></li>
Expand Down Expand Up @@ -7571,7 +7571,7 @@
<li class='green'><span class=''> </span><code> },</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> synced: function () {</code></li>
<li class='green'><span class='hits'>11513</span><code> return this._static.synced;</code></li>
<li class='green'><span class='hits'>11523</span><code> return this._static.synced;</code></li>
<li class='green'><span class=''> </span><code> }</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> }</code></li>
Expand Down Expand Up @@ -9545,18 +9545,18 @@
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class='hits'>1</span><code>var virtualRow = function (name) {</code></li>
<li class='green'><span class='hits'>1214</span><code> var DOUBLE_UNDERSCORE = '__';</code></li>
<li class='green'><span class='hits'>1253</span><code> var DOUBLE_UNDERSCORE = '__';</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class='hits'>1214</span><code> var parts = name.split(DOUBLE_UNDERSCORE);</code></li>
<li class='green'><span class='hits'>1214</span><code> var table = parts[0], column = parts[1];</code></li>
<li class='green'><span class='hits'>1214</span><code> var ident = column ? QualifiedIdentifier.fromArgs([table, column]) : Identifier.fromArgs([name]);</code></li>
<li class='green'><span class='hits'>1214</span><code> var prox = methodMissing(ident, function (m) {</code></li>
<li class='green'><span class='hits'>1253</span><code> var parts = name.split(DOUBLE_UNDERSCORE);</code></li>
<li class='green'><span class='hits'>1253</span><code> var table = parts[0], column = parts[1];</code></li>
<li class='green'><span class='hits'>1253</span><code> var ident = column ? QualifiedIdentifier.fromArgs([table, column]) : Identifier.fromArgs([name]);</code></li>
<li class='green'><span class='hits'>1253</span><code> var prox = methodMissing(ident, function (m) {</code></li>
<li class='green'><span class='hits'>3</span><code> return function () {</code></li>
<li class='green'><span class='hits'>3</span><code> var args = argsToArray(arguments);</code></li>
<li class='green'><span class='hits'>3</span><code> return SQLFunction.fromArgs([m, name].concat(args));</code></li>
<li class='green'><span class=''> </span><code> };</code></li>
<li class='green'><span class=''> </span><code> }, column ? QualifiedIdentifier : Identifier);</code></li>
<li class='green'><span class='hits'>1214</span><code> var ret = createFunctionWrapper(prox, function (m) {</code></li>
<li class='green'><span class='hits'>1253</span><code> var ret = createFunctionWrapper(prox, function (m) {</code></li>
<li class='green'><span class='hits'>663</span><code> var args = argsToArray(arguments);</code></li>
<li class='green'><span class='hits'>663</span><code> if (args.length) {</code></li>
<li class='green'><span class='hits'>657</span><code> return SQLFunction.fromArgs([name].concat(args));</code></li>
Expand All @@ -9566,8 +9566,8 @@
<li class='green'><span class=''> </span><code> }, function () {</code></li>
<li class='red'><span class='nohits'>0</span><code> return SQLFunction.fromArgs(arguments);</code></li>
<li class='green'><span class=''> </span><code> });</code></li>
<li class='green'><span class='hits'>1214</span><code> ret["__proto__"] = ident;</code></li>
<li class='green'><span class='hits'>1214</span><code> return ret;</code></li>
<li class='green'><span class='hits'>1253</span><code> ret["__proto__"] = ident;</code></li>
<li class='green'><span class='hits'>1253</span><code> return ret;</code></li>
<li class='green'><span class=''> </span><code>};</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class='hits'>1</span><code>var DATE_METHODS = ["getDate", "getDay", "getFullYear", "getHours", "getMilliseconds", "getMinutes", "getMonth", "getSeconds",</code></li>
Expand Down Expand Up @@ -10050,7 +10050,7 @@
<li class='green'><span class=''> </span><code>});</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class='hits'>1</span><code>exports.sql = methodMissing(sql, function (name) {</code></li>
<li class='green'><span class='hits'>1214</span><code> return virtualRow(name);</code></li>
<li class='green'><span class='hits'>1253</span><code> return virtualRow(name);</code></li>
<li class='green'><span class=''> </span><code>});</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class='hits'>1</span><code>var OPERTATOR_INVERSIONS = {</code></li>
Expand Down Expand Up @@ -10862,13 +10862,13 @@
<li class='green'><span class=''> </span><code> * @return {patio.sql.Expression} an expression.</code></li>
<li class='green'><span class=''> </span><code> */</code></li>
<li class='green'><span class=''> </span><code> fromArgs: function (args) {</code></li>
<li class='green'><span class='hits'>2613</span><code> var ret, Self = this;</code></li>
<li class='green'><span class='hits'>2613</span><code> try {</code></li>
<li class='green'><span class='hits'>2613</span><code> ret = new Self();</code></li>
<li class='green'><span class='hits'>2652</span><code> var ret, Self = this;</code></li>
<li class='green'><span class='hits'>2652</span><code> try {</code></li>
<li class='green'><span class='hits'>2652</span><code> ret = new Self();</code></li>
<li class='green'><span class=''> </span><code> } catch (ignore) {</code></li>
<li class='green'><span class=''> </span><code> }</code></li>
<li class='green'><span class='hits'>2613</span><code> this.apply(ret, args);</code></li>
<li class='green'><span class='hits'>2613</span><code> return ret;</code></li>
<li class='green'><span class='hits'>2652</span><code> this.apply(ret, args);</code></li>
<li class='green'><span class='hits'>2652</span><code> return ret;</code></li>
<li class='green'><span class=''> </span><code> },</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> /**</code></li>
Expand Down Expand Up @@ -11670,7 +11670,7 @@
<li class='green'><span class=''> </span><code> * @property {String} value &lt;b&gt;READ ONLY&lt;/b&gt; the column or table this identifier represents.</code></li>
<li class='green'><span class=''> </span><code> */</code></li>
<li class='green'><span class=''> </span><code> constructor: function (value) {</code></li>
<li class='green'><span class='hits'>16388</span><code> this.__value = value;</code></li>
<li class='green'><span class='hits'>16466</span><code> this.__value = value;</code></li>
<li class='green'><span class=''> </span><code> },</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> /**</code></li>
Expand Down Expand Up @@ -17505,10 +17505,10 @@
<li class='green'><span class=''> </span><code> *</code></li>
<li class='green'><span class=''> </span><code> */</code></li>
<li class='green'><span class=''> </span><code> constructor: function () {</code></li>
<li class='green'><span class='hits'>2783</span><code> if (comb.isUndefinedOrNull(this.__associations)) {</code></li>
<li class='green'><span class='hits'>2680</span><code> this.__associations = {};</code></li>
<li class='green'><span class='hits'>2793</span><code> if (comb.isUndefinedOrNull(this.__associations)) {</code></li>
<li class='green'><span class='hits'>2685</span><code> this.__associations = {};</code></li>
<li class='green'><span class=''> </span><code> }</code></li>
<li class='green'><span class='hits'>2783</span><code> this._super(arguments);</code></li>
<li class='green'><span class='hits'>2793</span><code> this._super(arguments);</code></li>
<li class='green'><span class=''> </span><code> },</code></li>
<li class='green'><span class=''> </span><code></code></li>
<li class='green'><span class=''> </span><code> reload: function () {</code></li>
Expand Down
4 changes: 4 additions & 0 deletions docs/History.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,10 @@



<h1>0.9.2</h1>
<ul>
<li>Updated <code>comb</code> module</li>
</ul>
<h1>0.9.1</h1>
<ul>
<li>Updated <code>pg</code> module</li>
Expand Down
Loading

0 comments on commit 65f4c19

Please sign in to comment.