Skip to content

Commit

Permalink
SQLyog 13.1.2 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
wydeep committed Jan 3, 2019
1 parent b10b642 commit 09f00d6
Show file tree
Hide file tree
Showing 57 changed files with 5,465 additions and 264 deletions.
424 changes: 424 additions & 0 deletions build/RegisterEmail.cpp

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/SQLyogCommunity.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
<ClCompile Include="..\src\SQLTokenizer.cpp" />
<ClCompile Include="..\src\StatusbarMgmt.cpp" />
<ClCompile Include="..\src\TabAdvancedProperties.cpp" />
<ClCompile Include="..\src\TabCheck.cpp" />
<ClCompile Include="..\src\TabEditor.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
Expand Down Expand Up @@ -482,6 +483,7 @@
<ClInclude Include="..\include\StatusbarMgmt.h" />
<ClInclude Include="..\include\Symbols.h" />
<ClInclude Include="..\include\TabAdvancedProperties.h" />
<ClInclude Include="..\include\TabCheck.h" />
<ClInclude Include="..\include\TabEditor.h" />
<ClInclude Include="..\include\TabEditorSplitter.h" />
<ClInclude Include="..\include\TabFields.h" />
Expand Down
6 changes: 6 additions & 0 deletions build/SQLyogCommunity.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,9 @@
<ClCompile Include="..\src\jsoncpp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\TabCheck.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\AppInfo.h">
Expand Down Expand Up @@ -710,6 +713,9 @@
<ClInclude Include="..\include\jsoncpp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\TabCheck.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\include\bitmaps\about.ico">
Expand Down
2 changes: 1 addition & 1 deletion include/AppInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#define SQLITE_APPVERSION_MAJOR "10"
#define SQLITE_APPVERSION_MINOR "5"
#define COMPANY_COPYRIGHT "(c) 2001-2018 Webyog Inc."
#define COMPANY_COPYRIGHT "(c) 2001-2019 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)
Expand Down
5 changes: 4 additions & 1 deletion include/CalendarCtrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ class CalendarCtrl
void OnClickOk();

//Handles click of the OK button
void OnClickNow();
void OnClickNow(DataView *m_dv);

//Get preference to show server date and time when click on NOW button
wyBool GetPreferenceForNowButton();

//Handles click of the Cancel button
void OnClickCancel();
Expand Down
15 changes: 15 additions & 0 deletions include/CommonHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

#define FMT_SPACE_4 " "


#define REGKEY "Use any UUID here"


Expand Down Expand Up @@ -547,6 +548,18 @@ wyBool CheckForOnUpdate(wyString &strcreate, wyInt32 fieldpos);
*/
wyBool GetExpressionValue(wyChar * currentrow, wyString * expression);

//get the check constraint expression value by parsing the current row definition
/**
@param currentrow : FIELD definiton in create table statement
@param expression : Value of expression used
@returns wyTrue on success else wyFalse
*/
wyBool GetCheckConstraintValue(wyChar * currentrow, wyString * expression);
wyBool GettablelevelCheckConstraintValue(wyChar * currentrow, wyString * expression);
void CheckForQuotesAndReplace(wyString *name);

wyBool GetCheckConstraintName(wyChar * currentrow, wyString * checkconstraintname);

wyInt32 GetBitFieldColumnWidth(wyString &strcreate, wyInt32 fieldpos);

/// Gets the module filename length.
Expand Down Expand Up @@ -961,6 +974,8 @@ void RotateBitLeft (unsigned char *str);

void RemoveDefiner(wyString &text, const wyChar* pattern, wyInt32 extra);

void RemoveBrackets(wyString &text, const wyChar* pattern);

//void DebugLog(const char *buffer);
#ifdef _WIN32
void WriteLog(const wyChar* str);
Expand Down
2 changes: 2 additions & 0 deletions include/ConnectionTab.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ class ConnectionTab
*/
HWND GetActiveWindowHandle(HWND hwndtab);

//void insert(wyString tabname, opentabs *head);

/// To get tab index for active window
/*
@param hwndtab : IN connetiontab HANDLE
Expand Down
14 changes: 12 additions & 2 deletions include/CustTab.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ typedef LRESULT(CALLBACK* CTBWNDPROC)(HWND, UINT, WPARAM, LPARAM, wyBool* pishan
#define CTCN_PAINTTIMERSTART WM_USER+130
#define CTCN_PAINTTIMEREND WM_USER+132
#define CTCN_TABRENAME WM_USER+133
#define CTCN_DROPDOWNBUTTONCLICK WM_USER+134

#define CTBIF_TEXT 1
#define CTBIF_IMAGE 2
Expand Down Expand Up @@ -235,7 +236,9 @@ class CCustTab
@param isexplicit : IN whether the tab was closed with an explicti close operation
@returns wyBool, wyTrue if success, otherwise wyFalse
*/
wyBool DeleteItem(wyInt32 tabindex, wyBool isexplicit = wyFalse);

//Added notdeletefromstruct Param: wyTrue denotes the tab doesn't need to remove from the drop down structure, wyFalse: remove tab details from drop down
wyBool DeleteItem(wyInt32 tabindex, wyBool isexplicit = wyFalse, wyBool notdeletefromstruct = wyFalse);

/// Remove all tabs
/**
Expand Down Expand Up @@ -472,6 +475,9 @@ class CCustTab
*/
wyBool FreeItem(LPCTCITEMEX pitem, wyInt32 tabindex = -1);

/// Reset sequence numbers for different tabs
void ResetGlobalSequenceNumbers(wyString tabname);


/// Checks the Cursor position is over any of the tabs
/**
Expand Down Expand Up @@ -742,6 +748,10 @@ class CCustTab

void CreateBottomLinePen();

void UpdateDropDownStructPosition(wyInt32 selectedtab, wyInt32 dropindex);
void UpdateDropDownNodePosforconnection(wyInt32 selectedtab, wyInt32 dropindex);
void FindAndUpdateTheDropDown(wyInt32 selectedtab,wyInt32 dropindex);

/// Flag for tab width is fixed or not
wyBool m_isfixedlength;

Expand Down Expand Up @@ -989,7 +999,7 @@ wyInt32 CustomTab_SetMinTabWidth(HWND hwnd , wyInt32 cx);
@param index : IN Index of the tab to be deleted
@returns wyTrue on success else wyFalse
*/
wyBool CustomTab_DeleteItem(HWND hwnd , wyInt32 index);
wyBool CustomTab_DeleteItem(HWND hwnd , wyInt32 index,wyBool isdelrequired=wyFalse);


/// Function to delete all item from the tab
Expand Down
1 change: 1 addition & 0 deletions include/EditorProcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class EditorProcs : public EditorBase
@returns (HWND)handle to AdvEdit.
*/
HWND CreateAdvEdit(MDIWindow *wnd, HWND hwnd, HTREEITEM hitem, wyString *strhitemname = NULL);


///Function executes the current query.
///i.e the query in which the cursor is at the moment.
Expand Down
68 changes: 68 additions & 0 deletions include/FrameWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,49 @@ class MDIlisttemp : public wyElem
List *m_listtabeditor_temp;
};

enum TabType
{
querytab,
querybuilder,
schemadesigner,
datasearch,
none
};
class ListOfOpenQueryTabs : public wyElem
{
public:
wyString tabname;
wyInt32 seqofquerytab;
wyInt32 seqofquerybuilder;
wyInt32 seqofschemadesigner;
wyInt32 seqofdatasearch;
TabType tabtype;
ListOfOpenQueryTabs()
{
tabname = "";
seqofquerytab = 1;
seqofquerybuilder = 1;
seqofschemadesigner = 1;
seqofdatasearch = 1;
tabtype = none;
}
};
class MDIListForDropDrown : public wyElem
{
public:
wyString name;
MDIWindow *mdi;
List *opentab;
//HWND m_hwndconntabinlist;
//TabModule * m_hwndTabModuleinlist;
MDIListForDropDrown()
{
name = "";
opentab = new List();
}
};


class tabdetailelem : public wyElem
{
public:
Expand Down Expand Up @@ -136,6 +179,19 @@ class QueryRestore : public wyElem
wyString m_content;
};

class ListofOpenTabs : public wyElem
{
public:
wyString name;
//HWND m_hwndconntabinlist;
TabModule * m_hwndTabModuleinlist;
ListofOpenTabs()
{
name = "";

}
};

class FrameWindow
{

Expand Down Expand Up @@ -653,6 +709,10 @@ class FrameWindow

void LoadConnTabPlusMenu(LPARAM lparam);

//Display connection and query tab drop down menu

void LoadConnTabDropDownMenu(LPARAM lparam);

static void CALLBACK TooltipTimerProc(HWND hwnd, UINT message, UINT_PTR id, DWORD time);

static void ShowQueryExecToolTip(wyBool show = wyTrue);
Expand Down Expand Up @@ -773,6 +833,8 @@ class FrameWindow

wyInt32 m_focussedcon;

wyBool m_isresizing;


#ifdef COMMUNITY
//Tab Header object
Expand Down Expand Up @@ -1673,6 +1735,12 @@ class FrameWindow
*/
void OnImportConnectionDetails();

/// Function to update dropdown structure
/**
*/
void UpdateDropDownStruct(wyString tabname);


wyBool SaveConnectionDetails(wySQLite *ssnsqliteobj = NULL);
wyBool SaveConnectionDetails2(wySQLite *ssnsqliteobj = NULL);
Expand Down
2 changes: 1 addition & 1 deletion include/FrameWindowSplitter.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class FrameWindowSplitter
/**
@returns wyBool, wyTrue always
*/
wyBool Resize(wyBool isannouncements = wyFalse);
wyBool Resize(wyBool isannouncements = wyFalse, wyBool ismanualresize =wyFalse);

/// Helps to Resize connection window
/**
Expand Down
4 changes: 4 additions & 0 deletions include/Global.h
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,7 @@ typedef struct tagsqlite
*/

typedef struct tagGlobals
{
wyInt32 m_colcount;
Expand Down Expand Up @@ -717,6 +718,9 @@ typedef struct tagGlobals
wyBool m_sessionrestore;
wyString m_database;
wyString m_sessionbackup;
List *m_connectiontabnamelist;
List *m_mdilistfordropdown;

} GLOBALS, *PGLOBALS;


Expand Down
18 changes: 16 additions & 2 deletions include/MDIWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class tabeditorelem : public wyElem
wyBool m_isedited;
wyInt32 m_leftortoppercent;
wyString m_content;

};

class TableDiag
Expand Down Expand Up @@ -288,6 +289,9 @@ class MDIWindow
{
public:

wyBool m_isfromsave;
wyBool m_isfromsaveas;
wyBool m_fromdirtytab;
/// Parametric constructor
/**
@param hwnd : Window HANDLE
Expand Down Expand Up @@ -489,7 +493,7 @@ class MDIWindow
/**
@returns wyTrue
*/
void Resize();
void Resize(wyBool iswindowresize =wyFalse);

/// Ask or confirmation to save file and return the value.
/**
Expand Down Expand Up @@ -759,6 +763,8 @@ class MDIWindow
*/
void OnWmCreate(HWND hwnd);

void DelFromQueryStruct(MDIWindow *wnd);

/// Handles the WM_CLOSE case
/**
@param hwnd : Window HANDLE
Expand Down Expand Up @@ -999,7 +1005,15 @@ class MDIWindow

void LoadQueryTabPlusMenu(LPARAM lparam);

void PositionTabs(wyBool isupdtabledata, wyBool isupdhistory, wyBool isupdinfo);
void LoadQueryTabDropDownMenu(HWND hwnd, WPARAM wparam, LPARAM lparam);

void PositionTabs(wyBool isupdtabledata, wyBool isupdhistory, wyBool isupdinfo,wyBool delfromdropdown=wyFalse);

//delete info, Table data and History tabs from drop down strct
void DelFromDropdownStruct(MDIWindow *wnd,wyInt64 index);

void DelFromDropdownStructInfo(MDIWindow *wnd, wyInt64 index);
void DelFromDropdownStructtabledata(MDIWindow *wnd, wyInt64 index);

//Function to handle Timer for keep-alive ping

Expand Down
14 changes: 14 additions & 0 deletions include/MySQLVersionHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ wyBool IsMySQL565(Tunnel * tunnel, PMYSQL mysql);
//mariadb 5.2 for Virtual/Persistent
wyBool IsMariaDB52(Tunnel * tunnel, PMYSQL mysql);

/// Checks the server version is greater than or equal to 10.3.9
/**
for virtual columns Persistent->Stored
*/
wyBool IsMariaDB10309(Tunnel * tunnel, PMYSQL mysql);

//MySQL 5.7.0 for Virtual/Stored columns
wyBool IsMySQL57(Tunnel * tunnel, PMYSQL mysql);

Expand Down Expand Up @@ -198,4 +204,12 @@ wyChar *quote_for_like(const wyChar *name, wyChar *buff);
*/
void SetCharacterSet(Tunnel *tunnel, MYSQL * mysql, wyChar * charset);

/// Checks the server version is greater than or equal to 5.0.10
/**
@param tunnel: IN tunnel pointer
@param mysql: IN PMYSQL value
@returns wyBool, wyTrue if it is SUCCESS, else wyFalse
*/
wyBool IsMySQL80011(Tunnel * tunnel, PMYSQL mysql);

#endif
8 changes: 8 additions & 0 deletions include/ObjectBrowser.h
Original file line number Diff line number Diff line change
Expand Up @@ -1551,6 +1551,14 @@ class CCopyTable
*/
wyBool GetSelectStmt(wyString &select, wyString &alterQuery , wyWChar new_table[]);

/// Function prepares the select stmt and stores it in the buffer passed as parameter.
/**
@param select : Selected items.
*/
wyBool GetCheckConstraints(wyString &select, wyString &alterQuery, wyWChar new_table[]);



/// Function copies the initial field stmt. into the buffer.
/**
@param query : Query.
Expand Down
Loading

0 comments on commit 09f00d6

Please sign in to comment.