merge upstream changes to README.md and fix schema.adapter.logger

pocesar · Mar 15, 2014 · 78f6c7f · 78f6c7f
1 parent c2ab772
commit 78f6c7f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# March 15th 2014
+* Merge README.md changes from jugglingdb
+* Hopefully fix schema.adapter.logger that broke in `jugglingdb-redis`
+
 # February 15th 2014
 * JSHinted code
 * Fixed constructors

diff --git a/README.md b/README.md
@@ -249,11 +249,18 @@ the to callback hell, that's deeply nested and might lead to memory leaks.
 
     <!-- SQLite -->
     <tr>
-      <td><a href="http://www.sqlite.org/" target="_blank"><img width="16" src="https://raw.github.com/1602/jugglingdb/master/media/sqlite.png" style="vertical-align:middle"" alt="SQLite" /></a> SQLite</td>
+      <td><a href="http://www.sqlite.org/" target="_blank"><img width="16" src="https://raw.github.com/1602/jugglingdb/master/media/sqlite.png" style="vertical-align:middle" alt="SQLite" /></a> SQLite</td>
       <td><a href="https://github.com/jugglingdb/sqlite3-adapter" target="_blank">jugglingdb/sqlite3-adapter</a></td>
       <td><a href="https://github.com/anatoliychakkaev" target="_blank">Anatoliy Chakkaev</a></td>
       <td><a href="https://travis-ci.org/jugglingdb/sqlite3-adapter" target="_blank"><img src="https://travis-ci.org/jugglingdb/sqlite3-adapter.png?branch=master" alt="Build Status" /></a></td>
     </tr>
+    <!-- ArangoDB -->
+    <tr>
+      <td><a href="http://www.arangodb.org/"><img src="http://www.arangodb.org/wp-content/themes/triagens/images/favicon.ico" style="vertical-align:middle" alt="ArangoDB" /></a> ArangoDB</td>
+      <td><a href="https://github.com/m0ppers/jugglingdb-arango">jugglingdb-arango</a></td>
+      <td><a href="https://github.com/m0ppers">Andreas Streichardt</a></td>
+      <td><a href="https://travis-ci.org/m0ppers/jugglingdb-arango"><img src="https://travis-ci.org/m0ppers/jugglingdb-arango.png?branch=master" alt="Build Status" /></a></td>
+    </tr>
     <tr>
       <td>WebService</td>
       <td>built-in</td>

diff --git a/lib/schema.js b/lib/schema.js
@@ -109,10 +109,12 @@ function Schema(name, settings){
     };
 
     schema.adapter.logger = function (query){
-      var t1 = Date.now();
-      var log = this.log;
+      var
+        t1 = Date.now(),
+        self = this;
+
       return function (q){
-        log(q || query, t1);
+        self.log(q || query, t1);
       };
     };
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "promised-jugglingdb",
   "description": "Dual API, promise based version of JugglingDB, the ORM for every database: redis, mysql, neo4j, mongodb, couchdb, postgres, sqlite",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "author": "Anatoliy Chakkaev <rpm1602@gmail.com>",
   "keywords": [
     "promise",