Changed function name from db_write to db_execute

vdemydiuk · Mar 3, 2016 · d288272 · d288272
1 parent 6c76eb9
commit d288272
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/MqlDbAdapter/DbConnector.h b/MqlDbAdapter/DbConnector.h
@@ -6,7 +6,7 @@ namespace DB
     {
     public:
         virtual bool init() abstract;
-        virtual bool writeRecord(System::String^ sqlStr) abstract;
+        virtual int execute(System::String^ sqlStr) abstract;
         virtual bool close() abstract;
     };
 }
diff --git a/MqlDbAdapter/MqlAdapter.cpp b/MqlDbAdapter/MqlAdapter.cpp
@@ -28,9 +28,9 @@ extern "C"
         return MqlAdapter::Instance->Close(connection_id) == true ? 1 : 0;
 	}
 
-	__declspec(dllexport) int db_write(int connection_id, wchar_t* sqlstr)
+    __declspec(dllexport) int db_execute(int connection_id, wchar_t* sqlstr)
 	{
-        return MqlAdapter::Instance->Write(connection_id, gcnew String(sqlstr)) == true ? 1 : 0;
+        return MqlAdapter::Instance->Execute(connection_id, gcnew String(sqlstr));
 	}
 }
 
@@ -75,13 +75,13 @@ int MqlAdapter::Init(String^ connectionString, int dbType)
 	return connectionId;
 }
 
-bool MqlAdapter::Write(int connectionId, String^ sqlStr)
+int MqlAdapter::Execute(int connectionId, String^ sqlStr)
 {
-	bool res = false;
+	int res = -1;
 	if (m_connectors.ContainsKey(connectionId))
 	{
 		DbConnector^ connector = m_connectors[connectionId];
-		res = connector->writeRecord(sqlStr);
+		res = connector->execute(sqlStr);
 	}
 
 	return res;

diff --git a/MqlDbAdapter/MqlAdapter.h b/MqlDbAdapter/MqlAdapter.h
@@ -13,7 +13,7 @@ ref class MqlAdapter
 public:
 	static property MqlAdapter^ Instance { MqlAdapter^ get() { return %m_instance; } }
     int Init(System::String^ connectionString, int dbType);
-	bool Write(int connectionId, System::String^ sqlStr);
+	int Execute(int connectionId, System::String^ sqlStr);
 	bool Close(int connectionId);
 
 private:

diff --git a/MqlDbAdapter/MsSqlConnector.cpp b/MqlDbAdapter/MsSqlConnector.cpp
@@ -66,23 +66,26 @@ void MsSqlConnector::readRecords()
 	}
 }
 
-bool MsSqlConnector::writeRecord(String^ sqlStr)
+int MsSqlConnector::execute(String^ sqlStr)
 {
+    int res = -1;
+
 	try
 	{
 		SqlCommand^ cmd = gcnew SqlCommand();
 		cmd->CommandType = Data::CommandType::Text;
 		cmd->CommandText = sqlStr;
 		cmd->Connection = m_sqlConnection;
 
-		cmd->ExecuteNonQuery();
+        res = cmd->ExecuteNonQuery();
 	}
 	catch (Exception^ e)
 	{
 		Console::Write(e->ToString());
 		return false;
 	}
-	return true;
+
+    return res;
 }
 
 bool MsSqlConnector::close()

diff --git a/MqlDbAdapter/MsSqlConnector.h b/MqlDbAdapter/MsSqlConnector.h
@@ -14,7 +14,7 @@ namespace DB
         ~MsSqlConnector();
 
         virtual bool init() override;
-        virtual bool writeRecord(System::String^ sqlStr) override;		
+        virtual int execute(System::String^ sqlStr) override;
 		void readRecords();
         virtual bool close() override;
 

diff --git a/MqlDbAdapter/StubDbConnector.cpp b/MqlDbAdapter/StubDbConnector.cpp
@@ -23,9 +23,9 @@ bool DB::StubDbConnector::init()
     return false;
 }
 
-bool DB::StubDbConnector::writeRecord(System::String^ sqlStr)
+int DB::StubDbConnector::execute(System::String^ sqlStr)
 {
-    return true;
+    return 0;
 }
 
 bool DB::StubDbConnector::close()

diff --git a/MqlDbAdapter/StubDbConnector.h b/MqlDbAdapter/StubDbConnector.h
@@ -11,7 +11,7 @@ namespace DB
         ~StubDbConnector();
 
         virtual bool init() override;
-        virtual bool writeRecord(System::String^ sqlStr) override;
+        virtual int execute(System::String^ sqlStr) override;
         virtual bool close() override;
 
     private:

diff --git a/TestLibrary/Program.cs b/TestLibrary/Program.cs
@@ -16,12 +16,9 @@ class Program
         public static extern int db_close(int connection_id);
 
         [DllImport("MqlDbAdapter.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
-        public static extern int db_write(int connection_id,
-            [MarshalAsAttribute(UnmanagedType.LPWStr)] string sqlstr);
+        public static extern int db_execute(int connection_id, [MarshalAsAttribute(UnmanagedType.LPWStr)] string sqlstr);
         #endregion
 
-        private static IntPtr _message = IntPtr.Zero;
-
         static void Main(string[] args)
         {
             if (!TestStubDb())
@@ -51,7 +48,7 @@ private static bool TestStubDb()
                 return false;
             }
 
-            if (db_write(connId, null) < 0)
+            if (db_execute(connId, null) < 0)
             {
                 Console.WriteLine("StubDb: Write error!");
                 return false;
@@ -78,7 +75,7 @@ private static bool TestMsSql()
             }
 
             string sql = string.Format("INSERT INTO Pattern (Symbol, Time) VALUES ('{0}', {1})", "EURUSD", 1);
-            if (db_write(connId, sql) == 0)
+            if (db_execute(connId, sql) <= 0)
             {
                 Console.WriteLine("Write error: ");
                 return false;