MySQL Working...

dmfay · May 5, 2012 · 7b524ae · 7b524ae
1 parent 1897ab0
commit 7b524ae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/examples/callbacks.js b/examples/callbacks.js
@@ -4,9 +4,9 @@ var _ = require("underscore")._;
 
 
 
-massive.connect("postgres://postgres@localhost/test", function(err,db) {
-//massive.connect({user : "root", password : "", database : "test"}, function(err,db) {
-
+//massive.connect("postgres://postgres@localhost/test", function(err,db) {
+massive.connect({user : "root", password : "", database : "test"}, function(err,db) {
+  console.log("err " + err)
   var dropProducts = db.dropTable("products").execute(function(err,data){
     console.log("Products table dropped");
     createProducts();

diff --git a/examples/evented.js b/examples/evented.js
@@ -2,7 +2,8 @@ var massive = require("../index");
 var util = require("util");
 var _ = require("underscore")._;
 
-massive.connect("postgres://postgres@localhost/test", function(err, db){
+//massive.connect("postgres://postgres@localhost/test", function(err, db){
+massive.connect({user : "root", password : "", database : "test"}, function(err,db) {
   var dropProducts = db.dropTable("products");
 
   var createProducts = db.createTable("products", {

diff --git a/lib/mysql.js b/lib/mysql.js
@@ -186,7 +186,7 @@ var Table = function(tableName, pk, _db) {
       values.push(util.format('(%s)', v.join(', ')));
       parameters.push(_.values(data[i]));
     }
-    sql += values.join(",\n") + " \nRETURNING *";
+    sql += values.join(",\n");
     return new Query(sql, _.flatten(parameters), this);
   };
 
@@ -197,7 +197,7 @@ var Table = function(tableName, pk, _db) {
     var f = [];
     var seed = 0;
     _.each(fields, function(value, key) {
-      f.push(key + ' = $' + ++seed);
+      f.push(key + ' = ?');
       parameters.push(value);
     });
     var sql = util.format("UPDATE %s SET %s", this.name, f.join(', '));
@@ -222,6 +222,7 @@ var Table = function(tableName, pk, _db) {
 
 
 var MySQL = function(credentials){
+  console.log("Well hello MySQL")
   events.EventEmitter.call(this);
   var self = this;
   this.dbType = "MySQL";
@@ -230,21 +231,19 @@ var MySQL = function(credentials){
   this.sql = "";
   this.params = [];
 
-  this.tableSQL = "SELECT                         \
-    table_name as name,                           \
-    (select cu.column_name                        \
-      from                                        \
-         information_schema.key_column_usage cu,  \
-         information_schema.table_constraints tc  \
-      where                                       \
-        cu.constraint_name = tc.constraint_name   \
-      and tc.table_name = ist.table_name          \
-    ) as pk                                       \
-    from information_schema.tables ist            \
-    where table_schema NOT IN ('pg_catalog', 'information_schema')";
+  this.tableSQL = "SELECT table_name as 'name',     \
+    (                                               \
+      select column_name from                       \
+      information_schema.key_column_usage           \
+      where table_name = ist.table_name             \
+      and constraint_name = 'PRIMARY'               \
+    )  as 'pk'                                      \
+    from information_schema.tables ist              \
+    where table_schema = '" + credentials.database + "'";
+
 
   this.execute = function(sql, params, callback) {
-    //console.log("Executing " + sql)
+    console.log("Executing " + sql)
     var client = mysql.createClient(credentials);
 
     self.emit("beforeExecute", self);
@@ -316,8 +315,8 @@ this.createTable = function(tableName, columns) {
   for(var c in columns){
 
     if(c == "timestamps"){
-      _cols.push("created_at datetime not null");
-      _cols.push("updated_at timestamp not null default 'now'");
+      _cols.push("created_at datetime");
+      _cols.push("updated_at timestamp");
     }else{
       var colName = c;
       var colParts = columns[c].split(" ");
@@ -331,7 +330,6 @@ this.createTable = function(tableName, columns) {
   }
 
   _sql+= _cols.join(",") + ");";
-  //console.log(_sql);
   return new Query(_sql, [], new Table(tableName, columns.id, self));
 };