db, feat: switch mysql to fiber worker.

fibjs · Nov 11, 2017 · 5f33537 · 5f33537
1 parent d89d4d9
commit 5f33537
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/fibjs/src/db/sql/mssql.cpp b/fibjs/src/db/sql/mssql.cpp
@@ -23,7 +23,7 @@ result_t db_base::openMSSQL(exlib::string connString, obj_ptr<MSSQL_base>& retVa
     AsyncEvent* ac)
 {
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     if (qstrcmp(connString.c_str(), "mssql:", 6))
         return CHECK_ERROR(CALL_E_INVALIDARG);
@@ -108,7 +108,7 @@ result_t mssql::close(AsyncEvent* ac)
         return CHECK_ERROR(CALL_E_INVALID_CALL);
 
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     m_conn->Close();
     m_conn->Release();
@@ -123,7 +123,7 @@ result_t mssql::use(exlib::string dbName, AsyncEvent* ac)
         return CHECK_ERROR(CALL_E_INVALID_CALL);
 
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     bstr_t bstrName(utf8to16String(dbName).c_str());
     HRESULT hr;
@@ -141,7 +141,7 @@ result_t mssql::begin(AsyncEvent* ac)
         return CHECK_ERROR(CALL_E_INVALID_CALL);
 
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     HRESULT hr;
     long level = 0;
@@ -159,7 +159,7 @@ result_t mssql::commit(AsyncEvent* ac)
         return CHECK_ERROR(CALL_E_INVALID_CALL);
 
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     HRESULT hr;
 
@@ -176,7 +176,7 @@ result_t mssql::rollback(AsyncEvent* ac)
         return CHECK_ERROR(CALL_E_INVALID_CALL);
 
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     HRESULT hr;
 
@@ -335,7 +335,7 @@ result_t mssql::execute(exlib::string sql, obj_ptr<NArray>& retVal, AsyncEvent*
         return CHECK_ERROR(CALL_E_INVALID_CALL);
 
     if (ac->isSync())
-        return CHECK_ERROR(CALL_E_LONGSYNC);
+        return CHECK_ERROR(CALL_E_NOSYNC);
 
     return execute(sql.c_str(), (int32_t)sql.length(), retVal);
 }

diff --git a/test/db_test.js b/test/db_test.js
@@ -31,13 +31,23 @@ describe("db", () => {
             try {
                 conn.execute('drop table test;');
             } catch (e) {}
+
+            try {
+                conn.execute('drop table test_null;');
+            } catch (e) {}
+
         });
 
         after(() => {
             try {
                 conn.execute('drop table test;');
-                conn.close();
             } catch (e) {}
+
+            try {
+                conn.execute('drop table test_null;');
+            } catch (e) {}
+
+            conn.close();
         });
 
         it("empty sql", () => {