From ad14bd9dbc478d5d083cf9d707ed5b3c8bc733a0 Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Thu, 30 May 2013 17:23:31 -0700
Subject: [PATCH] Add more debugging info

---
 lib/datasource.js | 16 +++++++++++++---
 lib/sql.js        |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/datasource.js b/lib/datasource.js
index fd871109..a5e106e5 100644
--- a/lib/datasource.js
+++ b/lib/datasource.js
@@ -422,6 +422,7 @@ function fromDBName(dbName, camelCase) {
  * @param cb
  */
 DataSource.prototype.discoverSchema = function (owner, table, cb) {
+    var self = this;
     var dataSourceName = this.name || this.adapter.name;
 
     async.parallel(
@@ -443,19 +444,28 @@ DataSource.prototype.discoverSchema = function (owner, table, cb) {
                pks[pk.columnName] = pk.keySeq;
             });
 
-            // console.log(pks);
+            if(self.settings.debug) {
+                console.log('Primary keys: ', pks);
+            }
 
             var foreignKeys = results[2];
             foreignKeys.forEach(function(fk) {
-               fks[fk.fkColumnName] = {
+               var fkInfo = {
                    keySeq: fk.keySeq,
                    owner: fk.pkOwner,
                    tableName: fk.pkTableName,
                    columnName: fk.pkColumnName
                };
+               if(fks[fk.fkName]) {
+                   fks[fk.fkName].push(fkInfo);
+               } else {
+                   fks[fk.fkName] = [fkInfo];
+               }
             });
 
-            // console.log(fks);
+            if(self.settings.debug) {
+                console.log('Foreign keys: ', fks);
+            }
 
             if (!columns) {
                 cb && cb();
diff --git a/lib/sql.js b/lib/sql.js
index 5a50e9fd..895dcd05 100644
--- a/lib/sql.js
+++ b/lib/sql.js
@@ -29,7 +29,7 @@ BaseSQL.prototype.queryOne = function (sql, callback) {
 BaseSQL.prototype.dataSource = function(model) {
     var m = this._models[model];
     if(!m) {
-        console.log(new Error('Model not found: ' + model).stack);
+        console.trace('Model not found: ' + model);
     }
     return m.model.schema;
 }
@@ -139,7 +139,7 @@ BaseSQL.prototype.idColumnEscaped = function (model) {
 BaseSQL.prototype.id = function (model, prop) {
     var p = this._models[model].properties[prop];
     if(!p) {
-        console.log(new Error('Property not found: ' + model +'.' + prop).stack);
+        console.trace('Property not found: ' + model +'.' + prop);
     }
     return p.id;
 };