Updating options processing since they are now moved to driver

Author: mariano

.gitignore

@@ -1,5 +1,4 @@
 /build/*
-/mysql-test.js
 *.node
 *.sh
 *.swp

src/mysql.cc

@@ -37,7 +37,9 @@ v8::Handle<v8::Value> node_db_mysql::Mysql::New(const v8::Arguments& args) {
     }
 
     if (args.Length() > 0) {
-        v8::Handle<v8::Value> set = binding->set(args);
+        ARG_CHECK_OBJECT(0, options);
+
+        v8::Handle<v8::Value> set = binding->set(args[0]->ToObject());
         if (!set.IsEmpty()) {
             return scope.Close(set);
         }
@@ -48,11 +50,12 @@ v8::Handle<v8::Value> node_db_mysql::Mysql::New(const v8::Arguments& args) {
     return scope.Close(args.This());
 }
 
-v8::Handle<v8::Value> node_db_mysql::Mysql::set(const v8::Arguments& args) {
-    v8::Handle<v8::Value> result = node_db::Binding::set(args);
-
-    v8::Local<v8::Object> options = args[0]->ToObject();
-
+v8::Handle<v8::Value> node_db_mysql::Mysql::set(const v8::Local<v8::Object> options) {
+    ARG_CHECK_OBJECT_ATTR_OPTIONAL_STRING(options, hostname);
+    ARG_CHECK_OBJECT_ATTR_OPTIONAL_STRING(options, user);
+    ARG_CHECK_OBJECT_ATTR_OPTIONAL_STRING(options, password);
+    ARG_CHECK_OBJECT_ATTR_OPTIONAL_STRING(options, database);
+    ARG_CHECK_OBJECT_ATTR_OPTIONAL_UINT32(options, port);
     ARG_CHECK_OBJECT_ATTR_OPTIONAL_STRING(options, charset);
     ARG_CHECK_OBJECT_ATTR_OPTIONAL_BOOL(options, compress);
     ARG_CHECK_OBJECT_ATTR_OPTIONAL_STRING(options, initCommand);
@@ -65,6 +68,31 @@ v8::Handle<v8::Value> node_db_mysql::Mysql::set(const v8::Arguments& args) {
 
     node_db_mysql::Connection* connection = static_cast<node_db_mysql::Connection*>(this->connection);
 
+    v8::String::Utf8Value hostname(options->Get(hostname_key)->ToString());
+    v8::String::Utf8Value user(options->Get(user_key)->ToString());
+    v8::String::Utf8Value password(options->Get(password_key)->ToString());
+    v8::String::Utf8Value database(options->Get(database_key)->ToString());
+
+    if (options->Has(hostname_key)) {
+        connection->setHostname(*hostname);
+    }
+
+    if (options->Has(user_key)) {
+        connection->setUser(*user);
+    }
+
+    if (options->Has(password_key)) {
+        connection->setPassword(*password);
+    }
+
+    if (options->Has(database_key)) {
+        connection->setDatabase(*database);
+    }
+
+    if (options->Has(port_key)) {
+        connection->setPort(options->Get(port_key)->ToInt32()->Value());
+    }
+
     if (options->Has(charset_key)) {
         v8::String::Utf8Value charset(options->Get(charset_key)->ToString());
         connection->setCharset(*charset);
@@ -104,7 +132,7 @@ v8::Handle<v8::Value> node_db_mysql::Mysql::set(const v8::Arguments& args) {
         connection->setWriteTimeout(options->Get(writeTimeout_key)->ToInt32()->Value());
     }
 
-    return result;
+    return v8::Handle<v8::Value>();
 }
 
 v8::Persistent<v8::Object> node_db_mysql::Mysql::createQuery() const {

src/mysql.h

@@ -18,7 +18,7 @@ class Mysql : public node_db::Binding {
         Mysql();
         ~Mysql();
         static v8::Handle<v8::Value> New(const v8::Arguments& args);
-        v8::Handle<v8::Value> set(const v8::Arguments& args);
+        v8::Handle<v8::Value> set(const v8::Local<v8::Object> options);
         v8::Persistent<v8::Object> createQuery() const;
 };
 }