Skip to content

Commit

Permalink
SQLyog 12.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wyaadarsh committed Oct 26, 2016
1 parent 3e5252f commit 33c8ed8
Show file tree
Hide file tree
Showing 48 changed files with 1,949 additions and 241 deletions.
3 changes: 3 additions & 0 deletions include/CopyDatabase.h
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,9 @@ class CopyDatabase
wyBool m_iscreatedb;

DB_LIST *m_dblist; /* List of Db in temporary array */

int m_defaultdbindex; // variable to set the index of dropdown for target db

wyUInt32 m_countdb;
private:

Expand Down
41 changes: 39 additions & 2 deletions include/CustGrid.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#define GVN_LBUTTONMOUSEMOVE 0x00030
#define GVN_LBUTTONUP 0x00031
#define GVN_MOUSELEAVE 0x00032
#define GVN_TOOLTIP 0x00071
#define GVN_PREVTABORDERITEM 0x00033
#define GVN_SPLITTERMOVE 0x00034
#define GVN_LBUTTONDOWN 0x00050
Expand All @@ -76,6 +77,7 @@
#define GVN_MOUSEWHEEL 0x00061
#define GVN_DRAWWATERMARK 0x00062
#define GVN_SETFOCUS 0x00063
#define GVN_RESETDATAVIEWTOOLTIP 0x00065

#define GVKEY_HOME 36
#define GVKEY_END 35
Expand Down Expand Up @@ -288,6 +290,23 @@ class CCustGrid
CCustGrid(HWND h);
~CCustGrid();




HWND m_hwndtooltip;
POINT m_mouseprevpt;

/// Stucture containing tooltip info
TOOLINFO m_toolinfo;

//tooltip string
wyString m_tooltipstr;

VOID ToolTipInfo(HWND hwnd, LPNMTTDISPINFO lpnmtdi, wyString Text);

// Tool tip Unique ID for the tooltip of data view
wyInt32 m_tooltipidindex;

/// Inserts the column in the grid view
/**
@param pgvcol : IN Column details
Expand Down Expand Up @@ -559,6 +578,7 @@ class CCustGrid
*/
VOID SetMaxRowCount(LONG count);


/// Sets row long value data
/**
@param row : IN Row number
Expand Down Expand Up @@ -886,8 +906,9 @@ class CCustGrid
/// Gets the column header clicked
/**
@param pnt : IN Mouse points
@param rect : OUT Rectangle containing the row header
*/
wyInt32 GetRowHeader(POINT *pnt);
wyInt32 GetRowHeader(POINT *pnt, RECT* rect = NULL);

/// Gets the row and column when a drag and drop accures on the grid cell
/**
Expand Down Expand Up @@ -1042,6 +1063,8 @@ class CCustGrid
//////////////////////////////////////////////////
void GetSelectColumn(POINT pnt);

wyInt32 GetHoveredColumn();


///////////////////////////////////////////////

Expand Down Expand Up @@ -1814,7 +1837,7 @@ class CCustGrid
*/
void DrawRowButtons(HDC hdcmem, RECT *rect, RECT *recttemp, wyInt32 *rowcount);

/// Draws the grey rectangle for the cell
/// Draws the grey rectangle for the cell
/**
@param hdcmem : IN Device HANDLE
@param greyrect : IN The grey rectangle
Expand Down Expand Up @@ -2055,6 +2078,7 @@ class CCustGrid

//whether the browse button is pressed
wyBool m_ispressed;
wyBool g_bMouseTrack;
};

#define GV_MARKTYPE_ICON 1
Expand Down Expand Up @@ -2083,6 +2107,7 @@ class CCustGrid
#define GV_EX_NO_VER_BORDER 16
#define GV_EX_NO_HOR_BORDER 32
#define GV_EX_STRETCH_LAST_COL 64
#define GV_EX_COL_TOOLTIP 128

#define GV_DEFWIDTH 25
#define GV_DEFHIGHT 18
Expand Down Expand Up @@ -2182,6 +2207,18 @@ wyInt32 CustomGrid_RowPerPage (HWND hwnd);
*/
wyInt32 CustomGrid_InsertColumn (HWND hwnd, PGVCOLUMN pgvcol, wyBool repaint = wyTrue);

///
/***
@param HWND : IN Grid Window Handle
@param int : IN index of the column
@param wyWChar* : IN Text to be set
Tool tip for column header to be set initially while loading table data
***/
void SetToolTipForDataView(HWND, int, wyWChar*);

void RemoveToolTipForDataView(HWND);

/// Inserts a row in between
/**
@param hwnd : IN Grid Window Handle
Expand Down
4 changes: 4 additions & 0 deletions include/DataView.h
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,10 @@ class DataView
*/
void OnSplitterMove(wyInt32 col);

void OnColNameMouseHover(WPARAM wparam, wyString&);

void ResetDataViewTooltip();
////void ResettingTooltip(WPARAM wparam,LPARAM lparam);
///Function creates the outer frame window
/**
@returns void
Expand Down
7 changes: 6 additions & 1 deletion include/FrameWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,12 @@ class FrameWindow
wyBool m_mouseoverbuy;
wyString m_trialtext;
wyBool m_issessionedited;

#ifndef COMMUNITY
wyInt32 m_closealltrans;
wyInt32 m_intransaction;
wyBool m_topromptonimplicit;
wyBool m_topromptonclose;
#endif
};

/// Function to rstore connections
Expand Down
9 changes: 6 additions & 3 deletions include/FrameWindowHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
#define CELLBUTTONMINWIDTH 80

//for appending the list of child window names to window menu
#define MDISUBMENU 8
#define MDISUBMENU 9

// #defines for telling the advproperties what to show.
#define ADVPROP 1
Expand Down Expand Up @@ -562,7 +562,8 @@ wyInt32 compare (const void *arg1, const void *arg2);
*/
wyInt32 my_query(MDIWindow *wnd, Tunnel * tunnel, PMYSQL mysql, const wyChar *query, wyUInt32 length, wyBool batch = wyFalse,
wyBool isend = wyFalse, wyInt32 *stop = 0, wyInt32 querycount = 0, wyBool profile = wyTrue,
wyBool currentwnd = wyTrue, bool isread = false, wyBool isimport = wyFalse, wyBool fksethttpimport = wyFalse);
wyBool currentwnd = wyTrue, bool isread = false, wyBool isimport = wyFalse, wyBool fksethttpimport = wyFalse,
HWND fortransactionprompt = NULL);

/// Profiling the query or comment(SQLyog reconnected/failed) to history tab
/**
Expand Down Expand Up @@ -755,7 +756,9 @@ const wyChar *LeftPadText(const wyChar *text);
@param changeincombo : IN To change in combo box or not
*/
wyBool ChangeContextDB(Tunnel * tunnel, PMYSQL mysql, const wyChar *query, wyBool changeincombo = wyTrue);

#ifndef COMMUNITY
wyBool ChangeTransactionState(MDIWindow *wnd, const wyChar *query);
#endif
/// Gets the database name from the query.
/**
@param query : IN Query string
Expand Down
2 changes: 2 additions & 0 deletions include/GUIHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,8 @@ wyInt32 GetKBShortcut(wyWChar *menustring, wyWChar *shortcut);
*/
wyBool ChangeCRToLF(wyChar * text);

wyBool AddCRToLF(wyChar * text, wyChar * temp);

//Handles On treeview item expand
/**
@param treeparam : IN trview node struct handle
Expand Down
5 changes: 3 additions & 2 deletions include/Global.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ class wySQLite;
#define MNUOBJ_INDEX 6
#define MNUTOOL_INDEX 7
#define MNUPTOOL_INDEX 8
#define MNUWINDOW_INDEX 9
#define MNUHELP_INDEX 10
#define MNUTRANSACTION_INDEX 9
#define MNUWINDOW_INDEX 10
#define MNUHELP_INDEX 11
#define MNUENGINE_INDEX 20

#define DEF_TAB_SIZE 8
Expand Down
14 changes: 13 additions & 1 deletion include/MDIWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

#ifndef COMMUNITY
#include "ProfilerAdvisors.h"
#include "Transactions.h"
#endif

class TabMgmt;
Expand Down Expand Up @@ -398,6 +399,12 @@ class MDIWindow
*/
void CreateQueryStatus (HWND hwnd);

///create the handler for the transaction
/**
@param hwnd :Window HANDLE
@returns void
*/
void CreateTransactionhandler(HWND hwnd);
/// Create the vertical splitter
/**
@param hwnd :Window HANDLE
Expand Down Expand Up @@ -588,7 +595,7 @@ class MDIWindow
@param hwnddlg : Dialog window HANDLE
@returns wyTrue on success else wyFalse
*/
wyBool ExecuteFlush(wyString query, HWND hwndedit, INT writetobin, HWND hwnddlg);
wyBool ExecuteFlush(wyString query, HWND hwndedit, INT writetobin, HWND hwnddlg, wyInt32 *isflush = NULL);

/// Enables or disables the option in flush window.
/**
Expand Down Expand Up @@ -1028,8 +1035,13 @@ class MDIWindow
/// Querytab object pointer
CQueryObject *m_pcqueryobject;

///announcements object
Announcements *m_announcements;

///transaction object pointer
#ifndef COMMUNITY
Transactions *m_ptransaction;
#endif
/// TabModule object pointer
TabModule *m_pctabmodule;

Expand Down
3 changes: 3 additions & 0 deletions include/MySQLVersionHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ wyBool IsMySQL563(Tunnel * tunnel, PMYSQL mysql);
//MySQL 5.6.4
wyBool IsMySQL564MariaDB53(Tunnel * tunnel, PMYSQL mysql);

//MySQL 5.5.3 or mariadb 5.5
wyBool IsMySQL553MariaDB55(Tunnel * tunnel, PMYSQL mysql);

//MySQL 5.6.5
wyBool IsMySQL565MariaDB1001(Tunnel * tunnel, PMYSQL mysql);

Expand Down
4 changes: 2 additions & 2 deletions include/ObjectBrowser.h
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ class CCopyTable
/**
@param select : Selected items.
*/
wyBool GetSelectStmt(wyString &select);
wyBool GetSelectStmt(wyString &select, wyString &alterQuery , wyWChar new_table[]);

/// Function copies the initial field stmt. into the buffer.
/**
Expand Down Expand Up @@ -1640,7 +1640,7 @@ class CCopyTable
@param primary : Primary key name.
@param flgprimary : Primary flag.
*/
wyBool GetKeysPrimeKeyCheck(MYSQL_ROW *myrow, MYSQL_RES *myres, wyString &primary);
wyBool GetKeysPrimeKeyCheck(MYSQL_ROW *myrow, MYSQL_RES *myres, wyString &primary );

/// Handles Include index for getkey()
/**
Expand Down
3 changes: 2 additions & 1 deletion include/SQLMaker.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ wyUInt32 GetSelectTableStmt(wyString &query, const wyChar *dbname);
MYSQL_RES *ExecuteAndGetResult(MDIWindow *wnd, Tunnel *tunnel, PMYSQL mysql, wyString &query,
wyBool isprofile = wyTrue, wyBool isbatch = wyFalse, wyBool currentwnd = wyTrue,
bool isread = false, bool isforce = false, wyBool isimport = wyFalse,
wyInt32 *stop = 0, wyBool isimporthttp = wyFalse);
wyInt32 *stop = 0, wyBool isimporthttp = wyFalse, wyInt32 *isintransaction = NULL,
HWND fortransactionprompt = NULL);

/// Executes the query and returns the result set
/**
Expand Down
Loading

0 comments on commit 33c8ed8

Please sign in to comment.