version 12.2.5

webyog · Aug 18, 2016 · 6b455a7 · 6b455a7
1 parent 7d2fffd
commit 6b455a7
Show file tree

Hide file tree

Showing 36 changed files with 1,001 additions and 194 deletions.
diff --git a/include/BlobMgmt.h b/include/BlobMgmt.h
@@ -51,6 +51,7 @@ struct tagInsertUpdateBlob
 	wyBool      m_isoldnull;
 	wyBool      m_ischanged;
 	wyBool		m_isblob;
+	wyBool		m_isJson;
 };
 
 /*! Creates a type tagInsertUpdateBlob*/ 
@@ -217,6 +218,10 @@ class BlobMgmt
     */
 	wyBool				ProcessCancel();
 
+	/// Function to check whether the text entered is a valid JSON or not
+
+	wyBool				IsValidJsonText(wyString txt);
+
 	//Sests the dialog when pops up
 	/**
 	@return void
@@ -358,6 +363,12 @@ class BlobMgmt
 	/// Is Blob or Text?
 	wyBool				m_isblob;
 
+	// if JSON ...special handling is to be done
+	wyBool				m_isJson;
+
+	//if this is wyTrue then we dont close the window on clicking OK ---- JSON type
+	wyBool				donot_close_window;
+
 	//Object for FindAndRepalce class
 	FindAndReplace		*m_findreplace;
 };

diff --git a/include/CustTab.h b/include/CustTab.h
@@ -792,6 +792,9 @@ class CCustTab
 	/// Selected Tab
 	wyInt32         m_selectedtab;
 
+	///previously selected tab needed for tab deletion of tab other than selected tab
+	wyInt32         m_prevtab;
+
 	/// Starting Tab
 	wyInt32         m_starttab;
 

diff --git a/include/DataView.h b/include/DataView.h
@@ -1013,6 +1013,7 @@ class DataView
         */
 		wyBool			        IsBlob(wyInt32 col);
 
+		wyBool			        IsJSON(wyInt32 col);
         ///Helper function to change the filter icon
         /**
         @returns void
@@ -1146,6 +1147,7 @@ class DataView
         */
 	    wyBool                  AppendDataToQuery(MYSQL_ROW myrow, wyInt32 col, wyInt32 colcount, wyString &query, wyBool isblob);
 
+		wyBool                  AppendDataToQueryJSON(MYSQL_ROW myrow, wyInt32 col, wyInt32 colcount, wyString &query, wyBool isJSON);
         ///Helper function for showing mysql errors
         /**
         @param query            : IN query that raised the error
@@ -1265,6 +1267,9 @@ class DataView
         */
         wyBool                  AddDataToQuery(MYSQL_ROW data, wyString &query, const wyChar* delimiter, const wyChar* nullcheck, wyInt32 col, wyBool isfirst = wyTrue, wyBool ischeckspdata = wyFalse);
 
+
+		wyBool                  AddDataToQueryJSON(MYSQL_ROW data, wyString &query, const wyChar* delimiter, const wyChar* nullcheck, wyInt32 col, wyBool isfirst = wyTrue, wyBool ischeckspdata = wyFalse);
+
         ///Function generates the query to check duplicates
         /**
         @param row              : IN  row for which the query to be generated

diff --git a/include/ExportBatch.h b/include/ExportBatch.h
@@ -362,7 +362,7 @@ class ExportBatch
 	@param hwnd      : IN treeview handle
     @param pnmtv     : IN Tree items containing notification message
     */
-	wyBool		OnItemExpandingHelper(HWND hwnd , LPNMTREEVIEW pnmtv);
+	wyBool		OnItemExpandingHelper(HWND hwnd , LPNMTREEVIEW pnmtv, wyInt32 dataonly_check);
 
     /// stops exporting
     /**

diff --git a/include/FKDropDown.h b/include/FKDropDown.h
@@ -417,7 +417,7 @@ class FKDropDown
         ///Composite filter if any
         wyString                    m_compositefilter;
 
-        ///The button text to be shown in the blob columns
+        ///The button text to be shown in the blob/JSON columns
         wyString                    m_buttontext;
 
         ///Text for the column

diff --git a/include/FrameWindowHelper.h b/include/FrameWindowHelper.h
@@ -165,6 +165,7 @@
 #define		UM_GETEDITORTEXT							WM_USER+129
 #define		UM_QBITEMFROM								WM_USER+130
 #define		UM_QBITEMTO									WM_USER+131
+#define		UM_CHECKSTATECHANGE							WM_USER+132
 
 
 // some column #defines for validation.
@@ -246,6 +247,7 @@
 #define		SQLTEMPLATE_SECTION							"SQLTemplate"
 #define		STRING_NULL									"(NULL)"
 #define		STRING_BLOB									"BLOB..."
+#define		STRING_JSON									"JSON..."
 #define		BINARY_DATA									"(Binary/Image)"
 #define		STR_DEFAULT									" [default]"
 #define		SHIFTED										0x8000
@@ -523,7 +525,7 @@ All Files(*.*)\0*.*\0"
 #define BLOB_DATA			8
 #define DATETIME_DATA		16
 #define BIN_DATA			32
-
+#define JSON_DATA			64
 /// Function to notify user with various stuff.
 /**
 @param hwnd         : IN Window HANDLE
@@ -873,6 +875,8 @@ wyInt32  GetKeyWordCase();
 */
 void	GetColumnName(wyWChar *field);
 
+int		IsColumnTypeJson(wyWChar *field);
+
 /// Ensures a range is visible in the scintilla control
 /**
 @param hwnd					: IN Window Handler

diff --git a/include/GUIHelper.h b/include/GUIHelper.h
@@ -106,6 +106,8 @@ a:link { color: #3b7dbb; text-decoration:none;} a:visited { color: #3b7dbb; text
 #define CSS_CLASS2 ".extendedcodecaptionstyle{font: bold 12px \"Courier New\", Courier, mono; text-align:right; padding-left:10px; padding-right:10px;}\
 .extendedcodedatastyle{font: 12px \"Courier New\", Courier, mono; text-align:right; padding-left:10px; padding-right:10px;}"  
 
+#define GET_NDB_VERSION_STRING ("select @@ndb_version_string")
+
 typedef struct treeviewparams
 {
 	HWND		hwnd;
@@ -331,6 +333,10 @@ void                    SetExplainMenuItems(HMENU hmenu, HWND hwnd);
 void                    GetCurrentQuery(HWND hwndedit, MDIWindow *wnd, wyString *query, wyInt32 &pos);
 
 void                    GetCurrentQueryForAuto(HWND hwndedit, MDIWindow *wnd, wyString *query, wyInt32 &pos);
+
+wyBool					GetClusterdbSupportForFk(MDIWindow *wnd);
+
+
 ///Handle the File menu(Remove QB, SD options with PRO)
 /**
 @param hmenu         : IN Handle to the menu

diff --git a/include/MySQLVersionHelper.h b/include/MySQLVersionHelper.h
@@ -22,7 +22,7 @@
 
 #include "Datatype.h"
 #include "Tunnel.h"
-
+#include "wyString.h"
 const wyChar *IsNewMySQL(Tunnel	* tunnel, PMYSQL mysql);
 wyBool IsAlterOK(Tunnel * tunnel, PMYSQL mysql);
 
@@ -139,6 +139,8 @@ wyBool IsMySQL564MariaDB53(Tunnel * tunnel, PMYSQL mysql);
 //MySQL 5.6.5 
 wyBool IsMySQL565MariaDB1001(Tunnel * tunnel, PMYSQL mysql);
 
+void   GetVersionInfoforAutoComplete(MYSQL *mysql, wyString &VersionS);
+
 //MySQL 5.6.5
 wyBool IsMySQL565(Tunnel * tunnel, PMYSQL mysql);
 //mariadb 5.2 for Virtual/Persistent
@@ -149,7 +151,15 @@ wyBool IsMySQL57(Tunnel * tunnel, PMYSQL mysql);
 
 //MySQL 5.7.7 for SYS Schema
 wyBool IsMySQL577(Tunnel * tunnel, PMYSQL mysql);
+
+wyBool IsMySQL578(Tunnel * tunnel, PMYSQL mysql);
+
+
+//wyBool IsClusterDb(Tunnel * tunnel, PMYSQL mysql);
+
+
 /// Checks the server version is greater than or equal to mySQL5.0.2
+
 /**
 @param tunnel: IN tunnel pointer
 @param mysql: IN PMYSQL value

diff --git a/include/SQLyog.rc b/include/SQLyog.rc
@@ -1108,7 +1108,7 @@ END
 
 IDD_INSERTUPDATEBLOB DIALOGEX 0, 0, 427, 366
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-CAPTION " Insert/Update Blob Field"
+CAPTION " Insert/Update Blob/JSON Field"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "Tab2",IDC_MAINTAB,"SysTabControl32",TCS_BUTTONS,7,7,176,97
@@ -1583,7 +1583,7 @@ BEGIN
     LTEXT           "&Blob viewer",IDC_EDITOR3,8,41,60,9
     LTEXT           " ",IDC_BLOBFONT,76,41,120,10,SS_WORDELLIPSIS
     PUSHBUTTON      "Change...",IDC_BLOBCHANGE,205,40,41,12
-    LTEXT           "Ob&ject Browser",IDC_EDITOR5,8,54,60,10
+      LTEXT           "Ob&ject Browser",IDC_EDITOR5,8,54,60,10
     LTEXT           " ",IDC_OBFONT,76,54,120,10,SS_WORDELLIPSIS
     PUSHBUTTON      "Change...",IDC_OBCHANGE,205,54,41,12
     LTEXT           "&Others",IDC_EDITOR4,8,68,60,10
@@ -1802,7 +1802,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,27,202,10
     CONTROL         "Paste object name in &editor on double-click",IDC_GETTEXTONDBCLICK,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,38,202,10
-    CONTROL         "Enable &word wrap in SQL editor and BLOB viewer",IDC_WORDWRAP,
+    CONTROL         "Enable &word wrap in SQL editor, BLOB and JSON viewer",IDC_WORDWRAP,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,49,202,10
     CONTROL         "Enable transaction support for &batch process",IDC_TRANSACTIONENABLE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,60,202,10

diff --git a/include/TabFields.h b/include/TabFields.h
@@ -151,6 +151,8 @@ class TabFields
 	//is mysql version>=5.7
 	wyBool                     m_ismysql57;
 
+	wyBool						m_ismysql578;
+
     /// Flag used to check one auto increment field selected
 	wyBool			            m_autoincrpresent;
 

diff --git a/include/TableTabInterface.h b/include/TableTabInterface.h
@@ -78,6 +78,9 @@ class TableTabInterface : public TabTypes
 
     //..Indicates whether FK is supported or not..?
     wyBool                                  m_isfksupported;
+
+	//..Indicates if the mySQL cluster version supports foreign keys for NDBcluster or not.. 
+	wyBool									m_isfkforndbcluster;
 
     ///The index of sub-tab to be opened on opening the Alter Table tab
     wyInt32                                 m_setfocustotab;

diff --git a/include/Tunnel.h b/include/Tunnel.h
@@ -18,7 +18,7 @@
 
 
 
-#define		IS_BLOBVALUE(t) ((((t)>= MYSQL_TYPE_TINY_BLOB) && ((t)<= MYSQL_TYPE_BLOB)) || (t == MYSQL_TYPE_GEOMETRY))
+#define		IS_BLOBVALUE(t) ((((t)>= MYSQL_TYPE_TINY_BLOB) && ((t)<= MYSQL_TYPE_BLOB)) || (t == MYSQL_TYPE_GEOMETRY) || (t == MYSQL_TYPE_JSON) )
 
 #ifdef _WIN32
 

diff --git a/include/UserManager.h b/include/UserManager.h
@@ -72,6 +72,15 @@ class PrivilegedObject
         wyInt32     m_objecttype;
 };
 
+typedef struct userlist
+{
+	wyString	m_uname;
+	wyString	m_itemvalue;
+	wyBool		m_dropdown;
+	userlist	*next;
+
+}USERLIST;
+
 //User Manager class
 class UserManager
 {
@@ -622,6 +631,8 @@ class UserManager
 
     private:
 
+		USERLIST				*m_userlist;
+
         //whether to show the respective limitations
         wyBool                  m_showlimitations[U_MAXLIMITATIONS];
 
@@ -646,6 +657,8 @@ class UserManager
         //host name of the selected user
         wyString                m_host;
 
+		wyInt32					m_usercount;
+
         //tree view image list
         HIMAGELIST              m_himagelist;
 

diff --git a/include/mysql/mysql_com.h b/include/mysql/mysql_com.h
@@ -283,7 +283,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
                         MYSQL_TYPE_TINY_BLOB=249,
                         MYSQL_TYPE_MEDIUM_BLOB=250,
                         MYSQL_TYPE_LONG_BLOB=251,
-                        MYSQL_TYPE_BLOB=252,
+                        MYSQL_TYPE_BLOB=252,MYSQL_TYPE_JSON=245,
                         MYSQL_TYPE_VAR_STRING=253,
                         MYSQL_TYPE_STRING=254,
                         MYSQL_TYPE_GEOMETRY=255,
@@ -313,6 +313,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
 #define FIELD_TYPE_MEDIUM_BLOB MYSQL_TYPE_MEDIUM_BLOB
 #define FIELD_TYPE_LONG_BLOB MYSQL_TYPE_LONG_BLOB
 #define FIELD_TYPE_BLOB MYSQL_TYPE_BLOB
+#define FIELD_TYPE_JSON MYSQL_TYPE_JSON
 #define FIELD_TYPE_VAR_STRING MYSQL_TYPE_VAR_STRING
 #define FIELD_TYPE_STRING MYSQL_TYPE_STRING
 #define FIELD_TYPE_GEOMETRY MYSQL_TYPE_GEOMETRY

diff --git a/include/readme.txt b/include/readme.txt
@@ -120,7 +120,7 @@ Ctrl+Shift+H		Open History Tab
 Ctrl+Shift+I		Open Info Tab
 Ctrl+C			Copy
 Ctrl+A			Select All
-Ctrl+F			Find (SQL Window/Result Window And Table Data In Text Mode/Blob Viewer)
+Ctrl+F			Find (SQL Window/Result Window And Table Data In Text Mode/Blob Viewer/JSON Viewer)
 F3			Find Next (SQL Window/Result Window And Table Data In Text Mode)
 Ctrl+S			Save
 Ctrl+PgUp		Switch To Previous Tab

diff --git a/lib/Keywords.db b/lib/Keywords.db
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,7 +18,7 @@



		#define IS_BLOBVALUE(t) ((((t)>= MYSQL_TYPE_TINY_BLOB) && ((t)<= MYSQL_TYPE_BLOB)) \|\| (t == MYSQL_TYPE_GEOMETRY))
		#define IS_BLOBVALUE(t) ((((t)>= MYSQL_TYPE_TINY_BLOB) && ((t)<= MYSQL_TYPE_BLOB)) \|\| (t == MYSQL_TYPE_GEOMETRY) \|\| (t == MYSQL_TYPE_JSON) )

		#ifdef _WIN32

Expand Down