logging connections, no id, specs use docker dbs

Author: refractalize

.travis.yml

@@ -8,4 +8,3 @@ services:
   - mysql
 before_script:
   - mysql -e 'create database sworm;'
-  - psql -c 'create database sworm;' -U postgres

docker-compose.yml

@@ -0,0 +1,19 @@
+version: '2'
+
+services:
+  oracle:
+    image: wnameless/oracle-xe-11g
+    ports:
+      - "1521:1521"
+  mysql:
+    image: mysql
+    ports:
+      - "3306:3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+  postgres:
+    image: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=password

index.js

@@ -5,8 +5,9 @@ var pgDriver = require("./pgDriver");
 var mysqlDriver = require("./mysqlDriver");
 var oracleDriver = require("./oracleDriver");
 var sqliteDriver = require("./sqliteDriver");
-var debugQuery = require("debug")("sworm");
+var debug = require("debug")("sworm");
 var debugResults = require("debug")("sworm:results");
+var redactConfig = require('./redactConfig');
 
 var rowBase = function() {
   function fieldsForObject(obj) {
@@ -294,7 +295,7 @@ exports.db = function(config) {
         id: id,
         db: this,
         foreignKeyFor: foreignKeyFor,
-        compoundKey: id instanceof Array
+        compoundKey: id == false || id instanceof Array
       };
 
       var modelPrototype = _.extend(Object.create(rowBase), modelConfig);
@@ -351,17 +352,17 @@ exports.db = function(config) {
     },
 
     logError: function(query, params, error) {
-      debugQuery(query, params, error);
+      debug(query, params, error);
     },
 
     logResults: function(query, params, results, options) {
         if (typeof this.log == 'function') {
           return this.log(query, params, results, options);
         } else {
           if (params) {
-            debugQuery(query, params);
+            debug(query, params);
           } else {
-            debugQuery(query);
+            debug(query);
           }
 
           if (options && options.insert) {
@@ -402,7 +403,10 @@ exports.db = function(config) {
       }
 
       this.driver = driver();
+
+      debug('connecting to', redactConfig(_config));
       this.connection = this.driver.connect(_config).then(function () {
+        debug('connected to', redactConfig(_config));
         function finishRunningBeginSession() {
           self.runningBeginSession = false;
         }

package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "debug": "2.2.0",
+    "redact-url": "0.3.1",
     "underscore": "1.8.1"
   },
   "devDependencies": {

readme.md

@@ -260,7 +260,7 @@ var createEntity = db.model(options);
 `options` can contain the following:
 
   * `table` (`undefined`) the name of the table to save entities to
-  * `id` (`'id'`) the name of the identity column. This can be an array of id columns for compound keys.
+  * `id` (`'id'`) the name of the identity column. This can be an array of id columns for compound keys, or `false` if there is no id column.
   * `foreignKeyFor` a function that returns a foreign key field name for a member (see [Relationships](#relationships)), defaults to:
 
     ```js

redactConfig.js

@@ -0,0 +1,14 @@
+var redactUrl = require('./redactUrl');
+
+module.exports = function(config) {
+  var copy = JSON.parse(JSON.stringify(config));
+  if (copy.url) {
+    copy.url = redactUrl(copy.url, '********');
+  }
+
+  if (copy.config && copy.config.password) {
+    copy.config.password = '********';
+  }
+
+  return copy;
+};

redactUrl.js

@@ -0,0 +1,12 @@
+var urlUtils = require('url');
+
+module.exports = function(url, replacement) {
+  var urlComponents = urlUtils.parse(url);
+  if (urlComponents.auth) {
+    urlComponents.auth = urlComponents.auth.replace(/:.*/, ':' + replacement);
+
+    return urlUtils.format(urlComponents);
+  } else {
+    return url;
+  }
+};