Add warningCount() method and tests for issue #5 (closed).

Sannis · Mar 4, 2010 · 4a0731c · 4a0731c
1 parent 25ab6f0
commit 4a0731c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/mysql_sync_bindings.cc b/mysql_sync_bindings.cc
@@ -22,6 +22,7 @@ using namespace node;
 //static Persistent<String> getInfo_symbol;
 //static Persistent<String> lastInsertId_symbol;
 //static Persistent<String> query_symbol;
+//static Persistent<String> warningCount_symbol;
 
 class MysqlDbSync : public EventEmitter
 {
@@ -55,6 +56,7 @@ class MysqlDbSync : public EventEmitter
         //getInfo_symbol = NODE_PSYMBOL("getInfo");
         //lastInsertId_symbol = NODE_PSYMBOL("lastInsertId");
         //query_symbol = NODE_PSYMBOL("query");
+        //warningCount_symbol = NODE_PSYMBOL("warningCount");
 
         NODE_SET_PROTOTYPE_METHOD(t, "affectedRows", AffectedRows);
         NODE_SET_PROTOTYPE_METHOD(t, "connect", Connect);
@@ -66,6 +68,7 @@ class MysqlDbSync : public EventEmitter
         NODE_SET_PROTOTYPE_METHOD(t, "getInfo", GetInfo);
         NODE_SET_PROTOTYPE_METHOD(t, "lastInsertId", LastInsertId);
         NODE_SET_PROTOTYPE_METHOD(t, "query", Query);
+        NODE_SET_PROTOTYPE_METHOD(t, "warningCount", WarningCount);
 
         target->Set(v8::String::NewSymbol("MysqlDbSync"), t->GetFunction());
     }
@@ -426,6 +429,24 @@ class MysqlDbSync : public EventEmitter
 
         return scope.Close(True());
     }
+
+    static Handle<Value> WarningCount (const Arguments& args)
+    {
+        HandleScope scope;
+
+        MysqlDbSync *connection = ObjectWrap::Unwrap<MysqlDbSync>(args.This());
+
+        if(!connection->_connection)
+        {
+            return ThrowException(String::New("Not connected"));
+        }
+
+        unsigned int warning_count = mysql_warning_count(connection->_connection);
+
+        Local<Value> js_result = Integer::New(warning_count);
+
+        return scope.Close(js_result);
+    }
 };
 
 extern "C" void init (v8::Handle<Object> target)

diff --git a/tests/test-sync.js b/tests/test-sync.js
@@ -33,21 +33,14 @@ conn.close();
 sys.print("OK\n");
 
 sys.print("Connect to denied database using mysql_sync.connect(): ");
-flag = false;
-try{
-    conn.connect(host, user, password, database_denied);
-}
-catch(exception)
-{
-    flag = true;
-}
-if(flag)
+if(conn.connect(host, user, password, database_denied))
 {
-    sys.print("OK\n");
+    sys.print("FAILED\n");
 }
 else
 {
-    sys.print("FAILED\n");
+    sys.print("OK\n");
+    sys.puts("Error: [" + conn.errno() + "] " + conn.error());
 }
 
 conn.close();
@@ -148,6 +141,10 @@ for( var i in select_limit_result )
     sys.puts(i + ": " + JSON.stringify(select_limit_result[i]));
 }
 
+sys.print("conn.warningCount() test: ");
+sys.print(conn.warningCount());
+sys.print(" OK\n"); //TODO: new test for conn.warningCount()
+
 sys.print("Close connection: ");
 conn.close();
 sys.print("OK\n");