No commit message

charygao · Nov 14, 2017 · 5a36ea9 · 5a36ea9
1 parent f281baa
commit 5a36ea9
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/DAL/DbBase.cs b/DAL/DbBase.cs
@@ -486,16 +486,21 @@ private int ExeNonQuerySQL(string cmdText, bool isProc)
             {
                 try
                 {
-
-                    //else
-                    //{
-                    if (isUseUnsafeModeOnSqlite && !isProc && dalType == DalType.SQLite && !isOpenTrans)
+                    if (useConnBean != connObject.Master)
                     {
-                        _com.CommandText = "PRAGMA synchronous=Off;" + _com.CommandText;
+                        recordsAffected = -2;//从库不允许执行非查询操作。
+                        string msg = "You can't do ExeNonQuerySQL(with transaction or insert) on Slave DataBase!";
+                        debugInfo.Append(msg + AppConst.BR);
+                        WriteError(msg + (isProc ? "" : AppConst.BR + GetParaInfo(cmdText)));
+                    }
+                    else
+                    {
+                        if (isUseUnsafeModeOnSqlite && !isProc && dalType == DalType.SQLite && !isOpenTrans)
+                        {
+                            _com.CommandText = "PRAGMA synchronous=Off;" + _com.CommandText;
+                        }
+                        recordsAffected = _com.ExecuteNonQuery();
                     }
-                    //rowCount = 1;
-                    recordsAffected = _com.ExecuteNonQuery();
-                    //}
                 }
                 catch (DbException err)
                 {
@@ -930,16 +935,6 @@ private void TestOpen()
                 debugInfo.Append(err.Message);
             }
         }
-        internal bool OpenCon()
-        {
-            bool result = OpenCon(connObject.Master);
-            if (_IsAllowRecordSql)
-            {
-                connObject.SetNotAllowSlave();
-                isAllowResetConn = false;
-            }
-            return result;
-        }
 
         /// <summary>
         /// 切换链接
@@ -954,6 +949,16 @@ private void ResetConn(ConnBean cb)//, bool isAllowReset
                 _con.ConnectionString = DalCreate.FormatConn(dalType, conn);
             }
         }
+        internal bool OpenCon()
+        {
+            bool result = OpenCon(connObject.Master);
+            if (_IsAllowRecordSql)
+            {
+                connObject.SetNotAllowSlave();
+                isAllowResetConn = false;
+            }
+            return result;
+        }
         internal bool OpenCon(ConnBean cb)
         {
             try