SQLyog 12.4.2.0

webyog · May 17, 2017 · 7f0552a · 7f0552a
1 parent 3b03624
commit 7f0552a
Show file tree

Hide file tree

Showing 20 changed files with 509 additions and 119 deletions.
diff --git a/include/AppInfo.h b/include/AppInfo.h
@@ -38,7 +38,7 @@
 
 #define	SQLITE_APPVERSION_MAJOR						"10"
 #define	SQLITE_APPVERSION_MINOR						"5"
-#define	COMPANY_COPYRIGHT							"(c) 2001-2016 Webyog Inc."
+#define	COMPANY_COPYRIGHT							"(c) 2001-2017 Webyog Inc."
 
 #define FILEVER                                     MAJOR_VERSION_INT ## , ## MINOR_VERSION_INT ## , ## UPDATE_VERSION_INT ## , ## RELEASE_VERSION_INT
 #define STRFILEVER                                  MAJOR_VERSION "." MINOR_VERSION "." STRINGIZE(UPDATE_VERSION_INT) "." STRINGIZE(RELEASE_VERSION_INT)

diff --git a/include/ConnectionCommunity.h b/include/ConnectionCommunity.h
@@ -416,4 +416,44 @@ class ConnectionCommunity : public ConnectionBase
 	wyBool			 m_isapclose;		
 };
 
+class CRegInfoCommunity
+{
+public:
+	CRegInfoCommunity();
+	~CRegInfoCommunity();
+
+	static INT_PTR	CALLBACK DlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); 		
+	static LRESULT	CALLBACK StaticDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); 		
+	static LRESULT	CALLBACK ImageDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+	wyInt32         OnWmCtlcolorStatic(WPARAM wparam, LPARAM lparam);
+    void            OnWmInitDlgValues(HWND hwnd);
+    void            OnWmCommand(HWND hwnd, WPARAM wparam);
+	wyInt32         Show(HWND hwndParent, wyInt32 isRegistered=1);
+	wyInt32			Registered();
+	void			InitValues();
+	wyInt32			CheckValidEmail();
+	wyInt32			GeneratePasscode();
+	wyInt32			SendPasscodeRequest();
+	wyInt32			SendPasscodeVerifiedStatus();
+	wyInt32			PasscodeVerification();
+	void			ShowPasscodeWindow();
+	void			ShowEmailWindow();
+	wyBool			AddVerifiedToRegistry();
+
+	HWND			m_hwnddlg;
+	HWND			m_hwndedit;
+	HFONT			m_hlinkfont;
+    HFONT           m_hlinkfont2;
+	WNDPROC			m_wporigstaticproc;
+    WNDPROC			m_wporigimageproc;
+	wyBool			m_tracking;
+	wyInt32			m_isRegistered;
+	wyString		m_oldmail;
+	wyString		m_newmail;
+	wyString		m_passcode;
+	wyString		m_httpreqcode;
+};
+
+
 #endif
diff --git a/include/ExportAsSQL.h b/include/ExportAsSQL.h
@@ -123,7 +123,7 @@ typedef struct __schdextra_options
 	wyBool	  m_flushlogs;
 	wyBool	  m_flushmaster;
 	wyBool	  m_locktableread;
-	wyBool	  m_flushslave;
+	/*wyBool	  m_flushslave;*/
 	wyBool	  m_autocommit;
 	wyBool	  m_locktablewrite;
 	wyBool	  m_hextoblob;

diff --git a/include/MySQLVersionHelper.h b/include/MySQLVersionHelper.h
@@ -159,6 +159,9 @@ wyBool IsMySQL577(Tunnel * tunnel, PMYSQL mysql);
 
 wyBool IsMySQL578(Tunnel * tunnel, PMYSQL mysql);
 
+// For virtual column support check
+wyBool IsMySQL576Maria52(Tunnel * tunnel, PMYSQL mysql);
+
 
 //wyBool IsClusterDb(Tunnel * tunnel, PMYSQL mysql);
 

diff --git a/include/ObjectBrowser.h b/include/ObjectBrowser.h
@@ -404,6 +404,8 @@ class CQueryObject
 
     wyBool      IsSelectionOnTable();
 
+	void		setIsTruncate(wyBool);
+
     /// Double click manager.
     /**
     @param wparam   : Unsigned message parameter
@@ -904,15 +906,23 @@ class CQueryObject
 
     void PaintFilterWindow(HWND hwnd);
 
-
-    /*void    AddToDeleteList(HWND hwnd, TVITEMEX &tvi);*/
+	wyBool m_isTruncate;
+
+	/*void    AddToDeleteList(HWND hwnd, TVITEMEX &tvi);*/
 
     wyBool      m_isClearVisible;
 
     wyBool      m_AllowRename;
 
     wyString    m_prevString;
 
+#ifndef COMMUNTIY
+	wyBool		m_isRegexChecked;
+	HWND		m_hwndRegex;
+	HWND		m_hwndRegexText;
+	WNDPROC		m_RegexProc;
+#endif
+
     wyString    m_matchString;
 
     wyBool      m_OBFilterWorkInProgress;

diff --git a/include/SQLyog.rc b/include/SQLyog.rc
@@ -577,6 +577,7 @@ BEGIN
         END
         MENUITEM SEPARATOR
         MENUITEM "Create Schema For Database In &HTML...\tCtrl+Shift+Alt+S", ID_OBJECT_CREATESCHEMA
+       /* MENUITEM "Rebuild Tag",                 ID_DATABASE_REBUILDTAGS*/
     END
     POPUP "T&able"
     BEGIN
@@ -728,7 +729,7 @@ BEGIN
         BEGIN
             MENUITEM "Repeatable Read",             ID_TRX_REPEATABLEREAD, CHECKED
             MENUITEM "Read Committed",              ID_TRX_READCOMMITED
-            MENUITEM "Read Uncommitted",             ID_TRX_READUNCOMMITED
+            MENUITEM "Read Uncommitted",            ID_TRX_READUNCOMMITED
             MENUITEM "Serializable",                ID_TRX_SERIALIZABLE
         END
         MENUITEM SEPARATOR
@@ -895,14 +896,14 @@ BEGIN
     LTEXT           "(Use ';' to separate multiple databases. Leave blank to display all)",IDC_COLONST,119,160,242,18,WS_DISABLED
     CONTROL         "Use Co&mpressed Protocol",IDC_COMPRESS,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,119,175,95,10
     PUSHBUTTON      "?",IDC_COMPRESSHELP,340,175,16,11
-	CONTROL         "Read-Only Connection",IDC_READONLY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,228,175,86,10
+    CONTROL         "Read-Only Connection",IDC_READONLY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,228,175,86,10
     GROUPBOX        "Session Idle Timeout",IDC_TIMEOUT,119,188,139,28
     CONTROL         "De&fault",IDC_TIMEOUTDEF,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_GROUP,124,200,38,10
     CONTROL         "",IDC_TIMEOUTOPT,"Button",BS_AUTORADIOBUTTON | WS_DISABLED,164,200,12,10
     EDITTEXT        IDC_TIMEOUTEDIT,176,198,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
     LTEXT           "(seconds)",IDC_TIMESEC,221,200,33,12
     GROUPBOX        "&Keep-Alive Interval",IDC_KEEPALIVE,264,188,92,28,WS_DISABLED
-	LTEXT			"Need Help?", IDC_LINK,310,218,44,8, NOT WS_VISIBLE | SS_NOTIFY | SS_CENTERIMAGE
+    LTEXT           "Need Help?",IDC_LINK,310,218,44,8,SS_NOTIFY | SS_CENTERIMAGE | NOT WS_VISIBLE
     EDITTEXT        IDC_PINGINTERVAL,270,198,45,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
     LTEXT           "(seconds)",IDC_KEEPALIVESEC,320,200,32,8,WS_DISABLED
     GROUPBOX        "",IDC_TUNNELGRP,117,72,242,154,NOT WS_VISIBLE
@@ -1609,6 +1610,26 @@ BEGIN
     ICON            "",IDC_STATICIMG,7,8,21,20
 END
 
+IDD_REGISTERSPLASH DIALOGEX 0, 0, 299, 103
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY | WS_EX_CONTROLPARENT
+CAPTION " SQLyog Community"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "This is the Community edition of SQLyog",IDC_TRIALSTATIC,4,11,291,8,SS_NOTIFY
+    LTEXT           "Enter email address to start evaluation",IDC_TITLE,4,25,192,8
+    EDITTEXT        IDC_TRIALEMAIL,183,26,104,12,ES_AUTOHSCROLL
+    LTEXT           "Enter passcode received in mail",IDC_TITLE2,4,26,192,8
+    EDITTEXT        IDC_PASSCODE,183,26,104,12,ES_AUTOHSCROLL
+    LTEXT           "To know more  ",IDC_STATIC,4,67,100,10
+    LTEXT           "click here",IDC_LINK,63,65,66,12,SS_NOTIFY | SS_CENTERIMAGE,WS_EX_TRANSPARENT
+    PUSHBUTTON      "Next",IDM_NEXT,244,86,51,14
+    LTEXT           "You will receive a passcode on the email provided above. Click Next to receive passcode",IDC_TRIALNOTESTATIC,5,45,282,19
+    PUSHBUTTON      "Back",IDM_BACK,134,86,51,14
+    PUSHBUTTON      "Resend",IDM_RESEND,189,86,51,14
+    DEFPUSHBUTTON      "Verify",IDM_VERIFY,244,86,51,14
+END
+
 IDD_SHOWIMPORTERR DIALOGEX 0, 0, 249, 83
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "SQLyog - SQL Dump Import Error"
@@ -1844,7 +1865,7 @@ BEGIN
     GROUPBOX        "Transaction Options",IDC_TRANSACTION,4,185,247,36
     CONTROL         "Prompt when query causing implicit commit is executed",IDC_PROMPTTRANSACTION,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,196,197,10
-	CONTROL         "Prompt when closing session or program if transaction is active.",IDC_PROMPTCLOSETRANSACTION,
+    CONTROL         "Prompt when closing session or program if transaction is active.",IDC_PROMPTCLOSETRANSACTION,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,208,212,10
 END
 
@@ -2328,9 +2349,9 @@ IDI_TRUNCDB             ICON                    "..\\include\\bitmaps\\truncated
 IDI_VIEWDATA            ICON                    "..\\include\\bitmaps\\viewdata.ico"
 IDI_SORTASC             ICON                    "..\\include\\bitmaps\\sortasc.ico"
 IDI_DBSYNC              ICON                    "..\\include\\bitmaps\\dbsync.ico"
-IDI_COMMIT				ICON					"..\\include\\bitmaps\\commit.ico"
-IDI_ROLLBACK			ICON					"..\\include\\bitmaps\\rollback.ico"					
-IDI_START_TRANSACTION	ICON					"..\\include\\bitmaps\\start_transaction.ico"
+IDI_COMMIT              ICON                    "..\\include\\bitmaps\\commit.ico"
+IDI_ROLLBACK            ICON                    "..\\include\\bitmaps\\rollback.ico"
+IDI_START_TRANSACTION   ICON                    "..\\include\\bitmaps\\start_transaction.ico"
 IDI_PREF                ICON                    "..\\include\\bitmaps\\preferences.ico"
 IDI_REORDERCOL          ICON                    "..\\include\\bitmaps\\reordercol.ico"
 IDI_EMPTYTABLE          ICON                    "..\\include\\bitmaps\\emptytable.ico"
@@ -2413,9 +2434,9 @@ IDI_FUNCTION            ICON                    "bitmaps\\function.ico"
 IDI_CONNECT_16          ICON                    "bitmaps\\connect_16.ico"
 IDI_COPYDATABASE_16     ICON                    "bitmaps\\copy_data_16.ico"
 IDI_DBSYNC_16           ICON                    "bitmaps\\dbsync_16.ico"
-IDI_COMMIT_16			ICON					"bitmaps\\commit_16.ico"
-IDI_ROLLBACK_16			ICON					"bitmaps\\rollback_16.ico"
-IDI_START_TRANSACTION_16	ICON				"bitmaps\\start_transaction_16.ico"
+IDI_COMMIT_16           ICON                    "bitmaps\\commit_16.ico"
+IDI_ROLLBACK_16         ICON                    "bitmaps\\rollback_16.ico"
+IDI_START_TRANSACTION_16 ICON                    "bitmaps\\start_transaction_16.ico"
 IDI_EXECUTEALL_16       ICON                    "bitmaps\\execall_16.ico"
 IDI_EXECUTE_16          ICON                    "bitmaps\\execute_16.ico"
 IDI_EXECUTEFORUPD_16    ICON                    "bitmaps\\execforupd_16.ico"
@@ -2620,6 +2641,12 @@ BEGIN
         BOTTOMMARGIN, 51
     END
 
+    IDD_REGISTERSPLASH, DIALOG
+    BEGIN
+        RIGHTMARGIN, 295
+        BOTTOMMARGIN, 100
+    END
+
     IDD_SHOWIMPORTERR, DIALOG
     BEGIN
         LEFTMARGIN, 7
@@ -3493,9 +3520,13 @@ END
 
 STRINGTABLE
 BEGIN
-	ID_STARTTRANSACTION_WITHNOMODIFIER  "Start a new Transaction"
-	ID_COMMIT_WITHNOMODIFIER			"Commit the ongoing transacton"	
-	ID_ROLLBACK_TRANSACTION				"Rollback the transaction"
+    ID_STARTTRANSACTION_WITHNOMODIFIER "Start a new Transaction"
+END
+
+STRINGTABLE
+BEGIN
+    ID_COMMIT_WITHNOMODIFIER "Commit the ongoing transacton"
+    ID_ROLLBACK_TRANSACTION "Rollback the transaction"
 END
 
 STRINGTABLE

diff --git a/include/Symbols.h b/include/Symbols.h
@@ -68,6 +68,8 @@
 #define IDC_CHK_DROPFUNCTIONS           1101
 #define IDC_CHK_DROPTRIGGERS            1102
 #define IDC_OBJECTFILTER                1103
+#define IDC_REGEXFILTER					1104
+#define IDC_REGEXFILTERTEXT				1105
 #define IDC_ABORT                       1211
 
 #define IDC_AVGROWLEN                   2003

diff --git a/include/Version.h b/include/Version.h
@@ -1,5 +1,5 @@
 #define MAJOR_VERSION_INT		12
-#define MINOR_VERSION_INT		3
-#define UPDATE_VERSION_INT		3
+#define MINOR_VERSION_INT		4
+#define UPDATE_VERSION_INT		2
 #define RELEASE_VERSION_INT		0        
 #define EXTRAINFO				""
diff --git a/include/resource.h b/include/resource.h
@@ -197,14 +197,15 @@
 #define IDI_SCHEMADESIGNER              802
 #define IDD_CREATEDB                    802
 #define IDD_MYSQL_ERROR                 803
+#define IDD_REGISTERSPLASH              804
 #define IDI_PKEY                        810
 #define IDI_CLOSETABLE                  812
 #define IDI_SDTABLEVIEW                 813
 #define IDI_EXPORTASIMG                 815
 #define IDI_SDPRINT                     816
-#define IDI_COMMIT						817
-#define IDI_ROLLBACK					818
-#define IDI_START_TRANSACTION			819
+#define IDI_COMMIT                      817
+#define IDI_ROLLBACK                    818
+#define IDI_START_TRANSACTION           819
 #define IDI_ADDTABLES                   820
 #define IDI_ALTERDB                     821
 #define IDI_PREVIOUS                    824
@@ -217,9 +218,9 @@
 #define IDI_EVENT                       838
 #define IDI_REFRESHCANVAS               839
 #define IDR_TABLESMENU                  840
-#define IDI_COMMIT_16					841
-#define IDI_ROLLBACK_16					842
-#define IDI_START_TRANSACTION_16		843
+#define IDI_COMMIT_16                   841
+#define IDI_ROLLBACK_16                 842
+#define IDI_START_TRANSACTION_16        843
 #define IDI_SDZOOMIN                    845
 #define IDI_SDZOOMOUT                   846
 #define IDI_ALTEREVENT                  847
@@ -485,7 +486,7 @@
 #define IDC_ENABLEUPGRADE               1064
 #define IDD_GETSQLYOGULTIMATE           1064
 #define IDD_OBCOLOR                     1065
-#define IDC_TRANSACTION					1067
+#define IDC_TRANSACTION                 1067
 #define IDC_EXPORTFILENAME              1081
 #define IDC_PROGRESS                    1082
 #define IDC_CHK_USEDBNAME               1083
@@ -773,7 +774,6 @@
 #define IDC_TIMEOUTOPT                  1526
 #define IDC_TIMEOUTEDIT                 1527
 #define IDC_COMPRESSHELP                1533
-#define IDC_READONLY					10289
 #define IDC_TIMEOUTHELP                 1534
 #define IDC_TIMESEC                     1535
 #define IDC_SHOWWARNING                 1536
@@ -955,8 +955,8 @@
 #define IDC_SELCHECK                    1708
 #define IDC_CH                          1708
 #define IDC_PROMPTTRANSACTION           1708
-#define	IDC_PROMPTCLOSETRANSACTION		1710
 #define IDC_OPENSEL                     1709
+#define IDC_PROMPTCLOSETRANSACTION      1710
 #define IDC_PROGRESS2                   1712
 #define IDC_RESTORE_PROGRESS            1712
 #define IDC_CONNECTION_NAME             1713
@@ -970,6 +970,18 @@
 #define IDC_SAVEPOINTEDIT               1755
 #define IDC_SAVEPOINTRELEASE_COMBO      1756
 #define IDC_ROLLBACKTO_COMBO            1757
+#define IDM_VERIFY                      1801
+#define IDM_NEXT                        1802
+#define IDM_RESEND                      1803
+#define IDM_BACK                        1804
+#define IDC_LITE                        1805
+#define IDC_IMAGELINK                   1806
+#define IDC_TRIALEMAIL                  1807
+#define IDC_PASSCODE                    1808
+#define IDC_TITLE                       1809
+#define IDC_TRIALNOTESTATIC             1810
+#define IDC_TITLE2                      1811
+#define IDC_TRIALSTATIC                 1812
 #define IDC_INITCOMMANDHELP             2644
 #define IDC_COMBOCUSTOM                 2645
 #define ID_IMPORT_FROMXML               2655
@@ -992,6 +1004,7 @@
 #define IDS_TITLE5                      10245
 #define IDS_SUBTITLE5                   10246
 #define IDC_DLGCONNECT_STOREPASSWORD    10247
+#define IDC_READONLY                    10289
 #define ID_LF_1                         39100
 #define ID_LF_2                         39101
 #define ID_LF_3                         39102
@@ -1609,6 +1622,7 @@
 #define ID_SAVEPOINT_CREATESAVEPOINT    41821
 #define ID_SAVEPOINT_RELEASESAVEPOINT   41822
 #define ID_Menu                         41823
+#define ID_DATABASE_REBUILDTAGS         41756
 #define IDC_INITCOMMAND                 44114
 #define IDC_EDITINITCOMMAND             44115
 #define IDC_INVISIBLE                   44116
@@ -1643,7 +1657,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        1018
-#define _APS_NEXT_COMMAND_VALUE         41825
+#define _APS_NEXT_COMMAND_VALUE         41826
 #define _APS_NEXT_CONTROL_VALUE         1716
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

diff --git a/src/ConnectionBase.cpp b/src/ConnectionBase.cpp
@@ -2084,7 +2084,7 @@ ConnectionBase::EnableToolButtonsAndCombo(HWND hwndtool, HWND hwndsecondtool, HW
 							ID_FORMATCURRENTQUERY,			IDC_DIFFTOOL,					 
 							ID_QUERYBUILDER,				ID_SCHEMADESIGNER,
 							IDM_TOOL_ADDUSER,				ID_STARTTRANSACTION_WITHNOMODIFIER,
-							ID_COMMIT_WITHNOMODIFIER,		ID_ROLLBACK_TRANSACTION	
+							ID_COMMIT_WITHNOMODIFIER,		ID_ROLLBACK_TRANSACTION
 						};
 
 	/* Enable/Disable all the toolbuttons */

diff --git a/src/ConnectionCommunity.cpp b/src/ConnectionCommunity.cpp
@@ -1072,7 +1072,8 @@ ConnectionCommunity::CreateIconList(HWND hwndmain, wyUInt32 *numicons)
 		ID_ROLLBACK_TOSAVEPOINT,		ID_ROLLBACK_TRANSACTION,
 		ID_ROLLBACK_ANDCHAIN,			ID_ROLLBACK_RELEASE,
 		ID_ROLLBACK_ANDNOCHAIN,			ID_ROLLBACK_NORELEASE,
-		ID_SAVEPOINT_CREATESAVEPOINT,	ID_SAVEPOINT_RELEASESAVEPOINT
+		ID_SAVEPOINT_CREATESAVEPOINT,	ID_SAVEPOINT_RELEASESAVEPOINT/*,
+		ID_DATABASE_REBUILDTAGS*/
 
 
 
@@ -1385,11 +1386,22 @@ ConnectionCommunity::CheckRegistration(HWND hwnd, void *main)
 	HKEY		key;
 	DWORD       dwdisposition;
 
+#if IS_FROM_WINDOWS_STORE == 1
+	CRegInfoCommunity    creg;
+	wyInt32		ret;
+#endif
+
 	 //ShowDialog(hwnd);
 
 	// create the registry.
 	VERIFY((RegCreateKeyEx(HKEY_CURRENT_USER, TEXT(REGKEY), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &key, &dwdisposition))== ERROR_SUCCESS);
-
+
+#if IS_FROM_WINDOWS_STORE == 1
+	ret = creg.Show(hwnd, 0);
+	if(ret == 2)
+		return wyFalse;
+#endif
+
 	return wyTrue;
 }