SQLyog 12.3.2

include/FrameWindowHelper.h

@@ -758,6 +758,7 @@ const wyChar *LeftPadText(const wyChar *text);
 wyBool	ChangeContextDB(Tunnel * tunnel, PMYSQL mysql, const wyChar *query, wyBool changeincombo = wyTrue);
 #ifndef COMMUNITY
 wyBool	ChangeTransactionState(MDIWindow *wnd, const wyChar *query);
+wyBool	CheckTransactionStart(MDIWindow *wnd, const wyChar *query);
 #endif
 /// Gets the database name from the query.
 /**

include/Version.h

@@ -1,5 +1,5 @@
 #define MAJOR_VERSION_INT		12
 #define MINOR_VERSION_INT		3
-#define UPDATE_VERSION_INT		1
+#define UPDATE_VERSION_INT		2
 #define RELEASE_VERSION_INT		0        
 #define EXTRAINFO				""

src/DataView.cpp

@@ -979,7 +979,7 @@ DataView::IsColumnVirtual(wyInt32 col)
 			//get the db and table name 
 			if(GetDBName(db, col) == wyTrue && GetTableName(table, col) == wyTrue && GetColumnName(column, col) == wyTrue)
 			 {
-				query.Sprintf("show full fields from `%s`.`%s` WHERE FIELD=\"%s\" AND (Extra LIKE \"%%VIRTUAL%%\" OR Extra LIKE \"%%STORED%%\" OR Extra LIKE \"%%PERSISTENT%%\")", db.GetString(), table.GetString(),column.GetString());
+				query.Sprintf("show full fields from `%s`.`%s` WHERE FIELD='%s' AND (Extra LIKE '%%VIRTUAL%%' OR Extra LIKE '%%STORED%%' OR Extra LIKE '%%PERSISTENT%%')", db.GetString(), table.GetString(),column.GetString());
 				fieldres = SjaExecuteAndGetResult(m_wnd->m_tunnel,&m_wnd->m_mysql,query);
 
 				if(fieldres)

src/FrameWindow.cpp

@@ -2665,8 +2665,10 @@ FrameWindow::OnWmCommand(WPARAM wParam)
 	case ID_WITHCONSISTENTSNAPSHOT_READWRITE:
 	case ID_STARTTRANSACTION_READONLY:
 	case ID_STARTTRANSACTION_READWRITE:
+		if(pcquerywnd->m_tunnel->IsTunnel() == false)
 		ptransaction->HandleStartTransaction(LOWORD(wParam), pcquerywnd->m_tunnel, &pcquerywnd->m_mysql); 
-
+		else
+			ptransaction->OnTunnelMessage(GetActiveWindow());
 		break;
 
 	case ID_COMMIT_WITHNOMODIFIER:
@@ -2676,7 +2678,6 @@ FrameWindow::OnWmCommand(WPARAM wParam)
 	case ID_COMMIT_NORELEASE:
 		VERIFY(hmenu = GetMenu(m_hwndmain));
 		ptransaction->HandleCommit(LOWORD(wParam), hmenu, pcquerywnd->m_tunnel, &pcquerywnd->m_mysql); 
-
 		break;
 
 	case ID_ROLLBACK_TRANSACTION:
@@ -2686,7 +2687,6 @@ FrameWindow::OnWmCommand(WPARAM wParam)
 	case ID_ROLLBACK_NORELEASE:
 		VERIFY(hmenu = GetMenu(m_hwndmain));
 		ptransaction->HandleRollback(LOWORD(wParam), hmenu, pcquerywnd->m_tunnel, &pcquerywnd->m_mysql); 
-
 		break;
 
 	case ID_SAVEPOINT_CREATESAVEPOINT:

src/FrameWindowHelper.cpp

@@ -1617,6 +1617,60 @@ ChangeTransactionState(MDIWindow *wnd, const wyChar *query)
 	}
 	return wyTrue;
 }
+wyBool
+CheckTransactionStart(MDIWindow *wnd, const wyChar *query)
+{
+	SQLFormatter        formatter;
+	wyString			queryStr, newquery;
+
+	queryStr.SetAs(query);
+	formatter.GetQueryWtOutComments(&queryStr, &newquery);
+	newquery.RTrim();
+	newquery.LTrim();
+
+	if(newquery.GetLength() != -1 && (newquery.FindI("START") == 0 || newquery.FindI("BEGIN") == 0 || newquery.FindI("COMMIT") == 0 || newquery.FindI("ROLLBACK") == 0))
+	{
+		newquery.SetAs(wnd->m_ptransaction->RemoveExtraSpaces(newquery.GetString()));
+
+		if(newquery.FindI("START") != -1 )
+		{
+			if(newquery.FindI("TRANSACTION") == 6)
+			{
+				wnd->m_ptransaction->OnTunnelMessage(wnd->m_hwnd);
+				return wyTrue;
+			}
+		}
+		else if(newquery.FindI("COMMIT") == 0 && newquery.GetLength() > 7)
+		{
+			wyString tempquery = newquery.Substr(7, newquery.GetLength() - 7);
+			newquery.SetAs(wnd->m_ptransaction->RemoveExtraSpaces(tempquery.GetString()));
+			if(newquery.FindI("AND CHAIN") == 0)
+			{
+				wnd->m_ptransaction->OnTunnelMessage(wnd->m_hwnd);
+				return wyTrue;
+			}
+		}
+		else if(newquery.FindI("ROLLBACK") == 0 && newquery.GetLength() > 9)
+		{
+			wyString tempquery = newquery.Substr(9, newquery.GetLength() - 9);
+			newquery.SetAs(wnd->m_ptransaction->RemoveExtraSpaces(tempquery.GetString()));
+			if(newquery.FindI("AND CHAIN") == 0)
+			{
+				wnd->m_ptransaction->OnTunnelMessage(wnd->m_hwnd);
+				return wyTrue;
+			}
+		}
+		else if(newquery.FindI("BEGIN") != -1)
+		{
+			if(wnd->m_ptransaction->HandleBegin(newquery.GetString()))
+			{
+				wnd->m_ptransaction->OnTunnelMessage(wnd->m_hwnd);
+				return wyTrue;
+			}
+		}
+	}
+	return wyFalse;
+}
 #endif
 wyBool
 ChangeContextDB(Tunnel * tunnel, PMYSQL mysql, const wyChar *query, wyBool changeincombo)

src/MDIWindow.cpp

@@ -249,18 +249,20 @@ MDIWindow::Create(wyBool iscon_res, ConnectionInfo* conninfo)
 		m_keepaliveinterval = 0;
 	} 
 #ifndef COMMUNITY
-	if(pGlobals->m_entlicense.CompareI("Professional") != 0)
+	if(pGlobals->m_entlicense.CompareI("Professional") != 0 && m_tunnel->IsTunnel() == false)
 	{
 		wyString		query, resstr;
 		MYSQL_RES*      myres;
 		MYSQL_ROW       row;
 		MDIWindow*		wnd;
 		wnd = GetActiveWin();
 
-		query.Sprintf("SHOW GLOBAL VARIABLES WHERE variable_name =  \"AUTOCOMMIT\"");
+		query.Sprintf("SHOW VARIABLES like 'AUTOCOMMIT'");
 		myres = ExecuteAndGetResult(wnd, m_tunnel, &m_mysql, query);
 		if(!myres && m_tunnel->mysql_affected_rows(m_mysql) == -1)
 		{
+			wnd->m_ptransaction->m_autocommit = wyTrue;
+			return wyTrue;
 		}
 		row =  m_tunnel->mysql_fetch_row(myres);
 		if(!row)
@@ -280,6 +282,7 @@ MDIWindow::Create(wyBool iscon_res, ConnectionInfo* conninfo)
 		}
 		else if(resstr.CompareI("OFF") == 0)
 		{
+			wnd->m_ptransaction->CallOnStart();
 			wnd->m_ptransaction->m_autocommit = wyFalse;
 		}
 	}

src/QueryThread.cpp

@@ -198,6 +198,15 @@ HelperExecuteQuery(QUERYTHREADPARAMS * param, const wyChar* query,wyBool ismulti
 
 	querytemp.SetAs(query);
 
+#ifndef COMMUNITY
+	if(pGlobals->m_entlicense.CompareI("Professional") != 0 && param->tunnel->IsTunnel() == wyTrue)
+	{
+		wyBool start_t = CheckTransactionStart(param->wnd, query);
+		if(start_t == wyTrue)
+			return IN_TRANSACTION;
+	}
+#endif
+
 	//if(param->m_highlimitvalue != -1 && param->m_lowlimitvalue != -1)
 	if(param->m_islimitpresent == wyFalse)
 		isselectrange = wyTrue;
@@ -327,6 +336,7 @@ HelperExecuteQuery(QUERYTHREADPARAMS * param, const wyChar* query,wyBool ismulti
 			#ifndef COMMUNITY
 			if(pGlobals->m_entlicense.CompareI("Professional") != 0)
 			{
+				if(param->tunnel->IsTunnel() == false)
 				ChangeTransactionState(param->wnd, query);
 			}
 			#endif