opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #2221: enhance SQL completion proposal in a way SynEdit/Lazarus propagates it, with a focus on column names

Browse Source
This commit is contained in:
Ansgar Becker
2025-07-28 15:37:57 +02:00
parent 103c580daa
commit cbde322fde
2 changed files with 188 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
source/main.lfm
View File

@ -8,13 +8,13 @@ object MainForm: TMainForm
ClientWidth = 998 ClientWidth = 998
DesignTimePPI = 120 DesignTimePPI = 120
Menu = MainMenu1 Menu = MainMenu1
Position = poMainFormCenter
OnActivate = FormActivate OnActivate = FormActivate
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnMouseWheel = FormMouseWheel OnMouseWheel = FormMouseWheel
OnShow = FormShow OnShow = FormShow
Position = poMainFormCenter
object StatusBar: TStatusBar object StatusBar: TStatusBar
Left = 0 Left = 0
Height = 29 Height = 29
@ -858,9 +858,9 @@ object MainForm: TMainForm
Top = 177 Top = 177
Width = 212 Width = 212
Align = alBottom Align = alBottom
OnMoved = spltPreviewMoved
ResizeAnchor = akBottom ResizeAnchor = akBottom
Visible = False Visible = False
OnMoved = spltPreviewMoved
end end
object ToolBarTree: TPanel object ToolBarTree: TPanel
Left = 0 Left = 0
@ -885,14 +885,14 @@ object MainForm: TMainForm
ImageIndex = 191 ImageIndex = 191
MaxLength = 0 MaxLength = 0
NumGlyphs = 1 NumGlyphs = 1
OnButtonClick = editDatabaseTableFilterLeftButtonClick
OnChange = editDatabaseTableFilterChange
OnExit = editDatabaseTableFilterExit
OnKeyPress = editDatabaseTableFilterKeyPress
PasswordChar = #0 PasswordChar = #0
Spacing = 0 Spacing = 0
TabOrder = 0 TabOrder = 0
TextHint = 'Database filter' TextHint = 'Database filter'
OnButtonClick = editDatabaseTableFilterLeftButtonClick
OnChange = editDatabaseTableFilterChange
OnExit = editDatabaseTableFilterExit
OnKeyPress = editDatabaseTableFilterKeyPress
end end
object btnTreeFavorites: TSpeedButton object btnTreeFavorites: TSpeedButton
AnchorSideLeft.Control = editTableFilter AnchorSideLeft.Control = editTableFilter
@ -923,14 +923,14 @@ object MainForm: TMainForm
ImageIndex = 192 ImageIndex = 192
MaxLength = 0 MaxLength = 0
NumGlyphs = 1 NumGlyphs = 1
OnButtonClick = editDatabaseTableFilterLeftButtonClick
OnChange = editDatabaseTableFilterChange
OnExit = editDatabaseTableFilterExit
OnKeyPress = editDatabaseTableFilterKeyPress
PasswordChar = #0 PasswordChar = #0
Spacing = 0 Spacing = 0
TabOrder = 1 TabOrder = 1
TextHint = 'Table filter' TextHint = 'Table filter'
OnButtonClick = editDatabaseTableFilterLeftButtonClick
OnChange = editDatabaseTableFilterChange
OnExit = editDatabaseTableFilterExit
OnKeyPress = editDatabaseTableFilterKeyPress
end end
end end
object DBtree: TLazVirtualStringTree object DBtree: TLazVirtualStringTree
@ -1017,7 +1017,7 @@ object MainForm: TMainForm
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = editFilterVT AnchorSideTop.Control = editFilterVT
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 32 Left = 38
Height = 20 Height = 20
Top = 10 Top = 10
Width = 36 Width = 36
@ -1028,7 +1028,7 @@ object MainForm: TMainForm
AnchorSideLeft.Control = lblFilterVT AnchorSideLeft.Control = lblFilterVT
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = pnlFilterVT AnchorSideTop.Control = pnlFilterVT
Left = 74 Left = 80
Height = 28 Height = 28
Top = 6 Top = 6
Width = 237 Width = 237
@ -1039,21 +1039,21 @@ object MainForm: TMainForm
ImageIndex = 192 ImageIndex = 192
MaxLength = 0 MaxLength = 0
NumGlyphs = 1 NumGlyphs = 1
OnButtonClick = editDatabaseTableFilterLeftButtonClick
OnChange = editFilterVTChange
OnExit = editDatabaseTableFilterExit
OnKeyPress = editDatabaseTableFilterKeyPress
PasswordChar = #0 PasswordChar = #0
Spacing = 0 Spacing = 0
TabOrder = 0 TabOrder = 0
TextHint = 'Regular expression' TextHint = 'Regular expression'
OnButtonClick = editDatabaseTableFilterLeftButtonClick
OnChange = editFilterVTChange
OnExit = editDatabaseTableFilterExit
OnKeyPress = editDatabaseTableFilterKeyPress
end end
object lblFilterVTInfo: TLabel object lblFilterVTInfo: TLabel
AnchorSideLeft.Control = editFilterVT AnchorSideLeft.Control = editFilterVT
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = editFilterVT AnchorSideTop.Control = editFilterVT
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 317 Left = 323
Height = 20 Height = 20
Top = 10 Top = 10
Width = 93 Width = 93
@ -1066,9 +1066,9 @@ object MainForm: TMainForm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblFilterVT AnchorSideRight.Control = lblFilterVT
Left = 6 Left = 6
Height = 20 Height = 26
Top = 10 Top = 7
Width = 20 Width = 26
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Flat = True Flat = True
@ -2163,7 +2163,7 @@ object MainForm: TMainForm
Left = 3 Left = 3
Height = 26 Height = 26
Top = 3 Top = 3
Width = 411 Width = 381
Align = alLeft Align = alLeft
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Around = 2 BorderSpacing.Around = 2
@ -2174,10 +2174,10 @@ object MainForm: TMainForm
object tbtnDataNext: TSpeedButton object tbtnDataNext: TSpeedButton
AnchorSideTop.Control = pnlDataTop AnchorSideTop.Control = pnlDataTop
AnchorSideRight.Control = tbtnDataShowAll AnchorSideRight.Control = tbtnDataShowAll
Left = 416 Left = 386
Height = 24 Height = 30
Top = 3 Top = 3
Width = 55 Width = 61
Action = actDataShowNext Action = actDataShowNext
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
@ -2189,10 +2189,10 @@ object MainForm: TMainForm
object tbtnDataShowAll: TSpeedButton object tbtnDataShowAll: TSpeedButton
AnchorSideTop.Control = pnlDataTop AnchorSideTop.Control = pnlDataTop
AnchorSideRight.Control = tbtnDataSorting AnchorSideRight.Control = tbtnDataSorting
Left = 473 Left = 449
Height = 24 Height = 30
Top = 3 Top = 3
Width = 80 Width = 86
Action = actDataShowAll Action = actDataShowAll
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
@ -2204,10 +2204,10 @@ object MainForm: TMainForm
object tbtnDataSorting: TSpeedButton object tbtnDataSorting: TSpeedButton
AnchorSideTop.Control = pnlDataTop AnchorSideTop.Control = pnlDataTop
AnchorSideRight.Control = tbtnDataColumns AnchorSideRight.Control = tbtnDataColumns
Left = 555 Left = 537
Height = 24 Height = 30
Top = 3 Top = 3
Width = 72 Width = 78
AllowAllUp = True AllowAllUp = True
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
@ -2221,10 +2221,10 @@ object MainForm: TMainForm
object tbtnDataColumns: TSpeedButton object tbtnDataColumns: TSpeedButton
AnchorSideTop.Control = pnlDataTop AnchorSideTop.Control = pnlDataTop
AnchorSideRight.Control = tbtnDataFilter AnchorSideRight.Control = tbtnDataFilter
Left = 629 Left = 617
Height = 24 Height = 30
Top = 3 Top = 3
Width = 81 Width = 87
AllowAllUp = True AllowAllUp = True
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
@ -2239,10 +2239,10 @@ object MainForm: TMainForm
AnchorSideTop.Control = pnlDataTop AnchorSideTop.Control = pnlDataTop
AnchorSideRight.Control = pnlDataTop AnchorSideRight.Control = pnlDataTop
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 712 Left = 706
Height = 24 Height = 30
Top = 3 Top = 3
Width = 57 Width = 63
AllowAllUp = True AllowAllUp = True
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
@ -2907,12 +2907,12 @@ object MainForm: TMainForm
ImageIndex = 193 ImageIndex = 193
MaxLength = 0 MaxLength = 0
NumGlyphs = 1 NumGlyphs = 1
OnButtonClick = buttonedEditClear
OnChange = filterQueryHelpersChange
PasswordChar = #0 PasswordChar = #0
Spacing = 0 Spacing = 0
TabOrder = 0 TabOrder = 0
TextHint = 'Filter ...' TextHint = 'Filter ...'
OnButtonClick = buttonedEditClear
OnChange = filterQueryHelpersChange
end end
object treeQueryHelpers: TLazVirtualStringTree object treeQueryHelpers: TLazVirtualStringTree
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
@ -2986,7 +2986,6 @@ object MainForm: TMainForm
TabOrder = 2 TabOrder = 2
OnDragDrop = SynMemoQueryDragDrop OnDragDrop = SynMemoQueryDragDrop
OnDragOver = SynMemoQueryDragOver OnDragOver = SynMemoQueryDragOver
OnKeyPress = SynMemoQueryKeyPress
OnMouseWheel = AnySynMemoMouseWheel OnMouseWheel = AnySynMemoMouseWheel
Gutter.Width = 68 Gutter.Width = 68
Gutter.MouseActions = <> Gutter.MouseActions = <>
@ -3426,6 +3425,7 @@ object MainForm: TMainForm
LineHighlightColor.Background = clNone LineHighlightColor.Background = clNone
LineHighlightColor.Foreground = clNone LineHighlightColor.Foreground = clNone
OnDropFiles = SynMemoQueryDropFiles OnDropFiles = SynMemoQueryDropFiles
OnProcessCommand = SynMemoQueryProcessCommand
OnReplaceText = SynMemoQueryReplaceText OnReplaceText = SynMemoQueryReplaceText
OnSpecialLineColors = SynMemoQuerySpecialLineColors OnSpecialLineColors = SynMemoQuerySpecialLineColors
OnStatusChange = SynMemoQueryStatusChange OnStatusChange = SynMemoQueryStatusChange
@ -3485,9 +3485,9 @@ object MainForm: TMainForm
OnChange = tabsetQueryClick OnChange = tabsetQueryClick
OnGetImageIndex = tabsetQueryGetImageIndex OnGetImageIndex = tabsetQueryGetImageIndex
Align = alTop Align = alTop
TabOrder = 2
OnMouseLeave = tabsetQueryMouseLeave OnMouseLeave = tabsetQueryMouseLeave
OnMouseMove = tabsetQueryMouseMove OnMouseMove = tabsetQueryMouseMove
TabOrder = 2
end end
object QueryGrid: TLazVirtualStringTree object QueryGrid: TLazVirtualStringTree
Left = 0 Left = 0
@ -3913,8 +3913,8 @@ object MainForm: TMainForm
Caption = 'New &window' Caption = 'New &window'
Hint = 'New window...' Hint = 'New window...'
ImageIndex = 37 ImageIndex = 37
OnExecute = actNewWindowExecute
ShortCut = 16462 ShortCut = 16462
OnExecute = actNewWindowExecute
end end
object actExitApplication: TAction object actExitApplication: TAction
Category = 'File' Category = 'File'
@ -3936,17 +3936,17 @@ object MainForm: TMainForm
Caption = '&Copy' Caption = '&Copy'
Hint = 'Copy|Copy to Clipboard' Hint = 'Copy|Copy to Clipboard'
ImageIndex = 3 ImageIndex = 3
ShortCut = 16451
OnExecute = actCopyOrCutExecute OnExecute = actCopyOrCutExecute
OnUpdate = actCopyUpdate OnUpdate = actCopyUpdate
ShortCut = 16451
end end
object actPaste: TAction object actPaste: TAction
Category = 'Various' Category = 'Various'
Caption = '&Paste' Caption = '&Paste'
Hint = 'Paste|Paste from Clipboard' Hint = 'Paste|Paste from Clipboard'
ImageIndex = 4 ImageIndex = 4
OnExecute = actPasteExecute
ShortCut = 16470 ShortCut = 16470
OnExecute = actPasteExecute
end end
object actUserManager: TAction object actUserManager: TAction
Category = 'Tools' Category = 'Tools'
@ -3960,8 +3960,8 @@ object MainForm: TMainForm
Caption = 'Cu&t' Caption = 'Cu&t'
Hint = 'Cut|Cuts the selection and puts it on the Clipboard' Hint = 'Cut|Cuts the selection and puts it on the Clipboard'
ImageIndex = 2 ImageIndex = 2
OnExecute = actCopyOrCutExecute
ShortCut = 16472 ShortCut = 16472
OnExecute = actCopyOrCutExecute
end end
object actUndo: TEditUndo object actUndo: TEditUndo
Category = 'Various' Category = 'Various'
@ -3975,8 +3975,8 @@ object MainForm: TMainForm
Category = 'Various' Category = 'Various'
Caption = 'Copy with tabs to spaces' Caption = 'Copy with tabs to spaces'
ImageIndex = 3 ImageIndex = 3
OnExecute = actCopyTabsToSpacesExecute
ShortCut = 24643 ShortCut = 24643
OnExecute = actCopyTabsToSpacesExecute
end end
object actAboutBox: TAction object actAboutBox: TAction
Category = 'Various' Category = 'Various'
@ -3997,8 +3997,8 @@ object MainForm: TMainForm
Caption = 'Find text on server' Caption = 'Find text on server'
Hint = 'Searches selected tables for text occurences' Hint = 'Searches selected tables for text occurences'
ImageIndex = 146 ImageIndex = 146
OnExecute = actTableToolsExecute
ShortCut = 24646 ShortCut = 24646
OnExecute = actTableToolsExecute
end end
object actExportData: TAction object actExportData: TAction
Category = 'Export/Import' Category = 'Export/Import'
@ -4013,8 +4013,8 @@ object MainForm: TMainForm
Caption = 'Print...' Caption = 'Print...'
Hint = 'Print List or Data' Hint = 'Print List or Data'
ImageIndex = 34 ImageIndex = 34
OnExecute = actPrintListExecute
ShortCut = 16464 ShortCut = 16464
OnExecute = actPrintListExecute
end end
object actCopyTable: TAction object actCopyTable: TAction
Category = 'Database' Category = 'Database'
@ -4030,8 +4030,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Execute SQL...|Execute SQL-query/queries...' Hint = 'Execute SQL...|Execute SQL-query/queries...'
ImageIndex = 57 ImageIndex = 57
OnExecute = actExecuteQueryExecute
ShortCut = 120 ShortCut = 120
OnExecute = actExecuteQueryExecute
end end
object actExecuteSelection: TAction object actExecuteSelection: TAction
Category = 'SQL' Category = 'SQL'
@ -4039,8 +4039,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Execute selected SQL...|Execute selected SQL-query/queries...' Hint = 'Execute selected SQL...|Execute selected SQL-query/queries...'
ImageIndex = 104 ImageIndex = 104
OnExecute = actExecuteQueryExecute
ShortCut = 16504 ShortCut = 16504
OnExecute = actExecuteQueryExecute
end end
object actExecuteCurrentQuery: TAction object actExecuteCurrentQuery: TAction
Category = 'SQL' Category = 'SQL'
@ -4048,8 +4048,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Run current query|Run currently focused SQL query' Hint = 'Run current query|Run currently focused SQL query'
ImageIndex = 105 ImageIndex = 105
OnExecute = actExecuteQueryExecute
ShortCut = 24696 ShortCut = 24696
OnExecute = actExecuteQueryExecute
end end
object actExplainCurrentQuery: TAction object actExplainCurrentQuery: TAction
Category = 'SQL' Category = 'SQL'
@ -4083,8 +4083,8 @@ object MainForm: TMainForm
Caption = 'Load SQL file...' Caption = 'Load SQL file...'
Hint = 'Load SQL file...' Hint = 'Load SQL file...'
ImageIndex = 51 ImageIndex = 51
OnExecute = actLoadSQLExecute
ShortCut = 16463 ShortCut = 16463
OnExecute = actLoadSQLExecute
end end
object actRunSQL: TAction object actRunSQL: TAction
Category = 'SQL' Category = 'SQL'
@ -4131,16 +4131,16 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Insert row into table' Hint = 'Insert row into table'
ImageIndex = 45 ImageIndex = 45
OnExecute = actDataInsertExecute
ShortCut = 45 ShortCut = 45
OnExecute = actDataInsertExecute
end end
object actDataDuplicateRowWithoutKeys: TAction object actDataDuplicateRowWithoutKeys: TAction
Category = 'Data' Category = 'Data'
Caption = 'Duplicate row without keys' Caption = 'Duplicate row without keys'
Enabled = False Enabled = False
ImageIndex = 45 ImageIndex = 45
OnExecute = actDataInsertExecute
ShortCut = 16429 ShortCut = 16429
OnExecute = actDataInsertExecute
end end
object actDataDuplicateRowWithKeys: TAction object actDataDuplicateRowWithKeys: TAction
Category = 'Data' Category = 'Data'
@ -4155,8 +4155,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Delete selected row(s)' Hint = 'Delete selected row(s)'
ImageIndex = 46 ImageIndex = 46
OnExecute = actDataDeleteExecute
ShortCut = 16430 ShortCut = 16430
OnExecute = actDataDeleteExecute
end end
object actDataPostChanges: TAction object actDataPostChanges: TAction
Category = 'Data' Category = 'Data'
@ -4164,8 +4164,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Post' Hint = 'Post'
ImageIndex = 55 ImageIndex = 55
OnExecute = actDataPostChangesExecute
ShortCut = 16397 ShortCut = 16397
OnExecute = actDataPostChangesExecute
end end
object actDataCancelChanges: TAction object actDataCancelChanges: TAction
Category = 'Data' Category = 'Data'
@ -4173,8 +4173,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Cancel editing' Hint = 'Cancel editing'
ImageIndex = 26 ImageIndex = 26
OnExecute = actDataCancelChangesExecute
ShortCut = 27 ShortCut = 27
OnExecute = actDataCancelChangesExecute
end end
object actCreateTable: TAction object actCreateTable: TAction
Category = 'Database' Category = 'Database'
@ -4190,8 +4190,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Delete all rows in selected table(s)' Hint = 'Delete all rows in selected table(s)'
ImageIndex = 46 ImageIndex = 46
OnExecute = actEmptyTablesExecute
ShortCut = 8238 ShortCut = 8238
OnExecute = actEmptyTablesExecute
end end
object actCreateDatabase: TAction object actCreateDatabase: TAction
Category = 'Database' Category = 'Database'
@ -4206,16 +4206,16 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'SQL help browser' Hint = 'SQL help browser'
ImageIndex = 31 ImageIndex = 31
OnExecute = actSQLhelpExecute
ShortCut = 112 ShortCut = 112
OnExecute = actSQLhelpExecute
end end
object actRefresh: TAction object actRefresh: TAction
Category = 'Various' Category = 'Various'
Caption = 'Refresh' Caption = 'Refresh'
Hint = 'Refresh' Hint = 'Refresh'
ImageIndex = 0 ImageIndex = 0
OnExecute = actRefreshExecute
ShortCut = 116 ShortCut = 116
OnExecute = actRefreshExecute
end end
object actFullRefresh: TAction object actFullRefresh: TAction
Category = 'Various' Category = 'Various'
@ -4223,8 +4223,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Get full statistics refresh on table data. Slow on InnoDB tables!' Hint = 'Get full statistics refresh on table data. Slow on InnoDB tables!'
ImageIndex = 184 ImageIndex = 184
OnExecute = actFullRefreshExecute
ShortCut = 8308 ShortCut = 8308
OnExecute = actFullRefreshExecute
end end
object actImportCSV: TAction object actImportCSV: TAction
Category = 'Export/Import' Category = 'Export/Import'
@ -4335,8 +4335,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Save SQL to a textfile' Hint = 'Save SQL to a textfile'
ImageIndex = 10 ImageIndex = 10
OnExecute = actSaveSQLAsExecute
ShortCut = 123 ShortCut = 123
OnExecute = actSaveSQLAsExecute
end end
object actSaveSQLselection: TAction object actSaveSQLselection: TAction
Category = 'SQL' Category = 'SQL'
@ -4344,8 +4344,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Save selected text to a file' Hint = 'Save selected text to a file'
ImageIndex = 10 ImageIndex = 10
OnExecute = actSaveSQLAsExecute
ShortCut = 24659 ShortCut = 24659
OnExecute = actSaveSQLAsExecute
end end
object actSaveSQLSnippet: TAction object actSaveSQLSnippet: TAction
Category = 'SQL' Category = 'SQL'
@ -4369,24 +4369,24 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Clear query editor' Hint = 'Clear query editor'
ImageIndex = 58 ImageIndex = 58
OnExecute = actClearEditorExecute
ShortCut = 16471 ShortCut = 16471
OnExecute = actClearEditorExecute
end end
object actClearFilterEditor: TAction object actClearFilterEditor: TAction
Category = 'Data' Category = 'Data'
Caption = 'Clear' Caption = 'Clear'
Hint = 'Clear filter editor' Hint = 'Clear filter editor'
ImageIndex = 58 ImageIndex = 58
OnExecute = actClearEditorExecute
ShortCut = 16471 ShortCut = 16471
OnExecute = actClearEditorExecute
end end
object actClearQueryLog: TAction object actClearQueryLog: TAction
Category = 'SQL' Category = 'SQL'
Caption = 'Clear' Caption = 'Clear'
Hint = 'Clear query log' Hint = 'Clear query log'
ImageIndex = 58 ImageIndex = 58
OnExecute = actClearEditorExecute
ShortCut = 16465 ShortCut = 16465
OnExecute = actClearEditorExecute
end end
object actQueryStopOnErrors: TAction object actQueryStopOnErrors: TAction
Category = 'SQL' Category = 'SQL'
@ -4410,23 +4410,23 @@ object MainForm: TMainForm
Caption = 'Find text ...' Caption = 'Find text ...'
Hint = 'Find text ...' Hint = 'Find text ...'
ImageIndex = 30 ImageIndex = 30
OnExecute = actQueryFindReplaceExecute
ShortCut = 16454 ShortCut = 16454
OnExecute = actQueryFindReplaceExecute
end end
object actQueryReplace: TAction object actQueryReplace: TAction
Category = 'SQL' Category = 'SQL'
Caption = 'Replace text ...' Caption = 'Replace text ...'
Hint = 'Replace text ...' Hint = 'Replace text ...'
ImageIndex = 59 ImageIndex = 59
OnExecute = actQueryFindReplaceExecute
ShortCut = 16466 ShortCut = 16466
OnExecute = actQueryFindReplaceExecute
end end
object actQueryFindAgain: TAction object actQueryFindAgain: TAction
Category = 'SQL' Category = 'SQL'
Caption = 'Find or replace again' Caption = 'Find or replace again'
ImageIndex = 142 ImageIndex = 142
OnExecute = actQueryFindAgainExecute
ShortCut = 114 ShortCut = 114
OnExecute = actQueryFindAgainExecute
end end
object actSetDelimiter: TAction object actSetDelimiter: TAction
Category = 'SQL' Category = 'SQL'
@ -4440,8 +4440,8 @@ object MainForm: TMainForm
Category = 'Data' Category = 'Data'
Caption = 'Apply filter' Caption = 'Apply filter'
ImageIndex = 55 ImageIndex = 55
OnExecute = actApplyFilterExecute
ShortCut = 120 ShortCut = 120
OnExecute = actApplyFilterExecute
end end
object actRemoveFilter: TAction object actRemoveFilter: TAction
Category = 'Data' Category = 'Data'
@ -4454,25 +4454,25 @@ object MainForm: TMainForm
Caption = '&Previous tab' Caption = '&Previous tab'
Hint = 'Previous tab|Go back to the previous tab' Hint = 'Previous tab|Go back to the previous tab'
ImageIndex = 117 ImageIndex = 117
OnExecute = actPreviousTabExecute
ShortCut = 24585 ShortCut = 24585
OnExecute = actPreviousTabExecute
end end
object actNextTab: TAction object actNextTab: TAction
Category = 'Tools' Category = 'Tools'
Caption = '&Next tab' Caption = '&Next tab'
Hint = 'Next tab|Go to the next tab' Hint = 'Next tab|Go to the next tab'
ImageIndex = 116 ImageIndex = 116
OnExecute = actNextTabExecute
ShortCut = 16393 ShortCut = 16393
OnExecute = actNextTabExecute
end end
object actSelectAll: TAction object actSelectAll: TAction
Category = 'Various' Category = 'Various'
Caption = 'Select all' Caption = 'Select all'
Hint = 'Select all|Select all items or text' Hint = 'Select all|Select all items or text'
ImageIndex = 118 ImageIndex = 118
ShortCut = 16449
OnExecute = actSelectAllExecute OnExecute = actSelectAllExecute
OnUpdate = ValidateControls OnUpdate = ValidateControls
ShortCut = 16449
end end
object actCreateProcedure: TAction object actCreateProcedure: TAction
Category = 'Database' Category = 'Database'
@ -4486,8 +4486,8 @@ object MainForm: TMainForm
Caption = 'New query tab' Caption = 'New query tab'
Hint = 'Open a blank query tab' Hint = 'Open a blank query tab'
ImageIndex = 132 ImageIndex = 132
OnExecute = actNewQueryTabExecute
ShortCut = 16468 ShortCut = 16468
OnExecute = actNewQueryTabExecute
end end
object actNewQueryTabNofocus: TAction object actNewQueryTabNofocus: TAction
Category = 'File' Category = 'File'
@ -4499,15 +4499,15 @@ object MainForm: TMainForm
Caption = 'Close query tab' Caption = 'Close query tab'
Enabled = False Enabled = False
ImageIndex = 133 ImageIndex = 133
OnExecute = actCloseQueryTabExecute
ShortCut = 16499 ShortCut = 16499
OnExecute = actCloseQueryTabExecute
end end
object actSelectInverse: TAction object actSelectInverse: TAction
Category = 'Various' Category = 'Various'
Caption = 'Invert selection' Caption = 'Invert selection'
ImageIndex = 138 ImageIndex = 138
OnExecute = actSelectInverseExecute
ShortCut = 16457 ShortCut = 16457
OnExecute = actSelectInverseExecute
end end
object actFilterPanel: TAction object actFilterPanel: TAction
Category = 'Various' Category = 'Various'
@ -4515,8 +4515,8 @@ object MainForm: TMainForm
Caption = 'Filter panel' Caption = 'Filter panel'
Hint = 'Activates the filter panel' Hint = 'Activates the filter panel'
ImageIndex = 30 ImageIndex = 30
OnExecute = actFilterPanelExecute
ShortCut = 49222 ShortCut = 49222
OnExecute = actFilterPanelExecute
end end
object actBulkTableEdit: TAction object actBulkTableEdit: TAction
Category = 'Tools' Category = 'Tools'
@ -4544,23 +4544,23 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Save SQL to file' Hint = 'Save SQL to file'
ImageIndex = 10 ImageIndex = 10
OnExecute = actSaveSQLExecute
ShortCut = 16467 ShortCut = 16467
OnExecute = actSaveSQLExecute
end end
object actDataResetSorting: TAction object actDataResetSorting: TAction
Category = 'Data' Category = 'Data'
Caption = 'Reset sorting' Caption = 'Reset sorting'
ImageIndex = 139 ImageIndex = 139
OnExecute = actDataResetSortingExecute
ShortCut = 32851 ShortCut = 32851
OnExecute = actDataResetSortingExecute
end end
object actReformatSQL: TAction object actReformatSQL: TAction
Category = 'SQL' Category = 'SQL'
Caption = 'Reformat SQL' Caption = 'Reformat SQL'
Hint = 'Automatically reformat disordered SQL in active editor to make it more readable' Hint = 'Automatically reformat disordered SQL in active editor to make it more readable'
ImageIndex = 140 ImageIndex = 140
OnExecute = actReformatSQLExecute
ShortCut = 16503 ShortCut = 16503
OnExecute = actReformatSQLExecute
end end
object actBlobAsText: TAction object actBlobAsText: TAction
Category = 'Data' Category = 'Data'
@ -4575,16 +4575,16 @@ object MainForm: TMainForm
Caption = 'Next' Caption = 'Next'
Hint = 'Next X rows' Hint = 'Next X rows'
ImageIndex = 79 ImageIndex = 79
OnExecute = actDataShowNextExecute
ShortCut = 49186 ShortCut = 49186
OnExecute = actDataShowNextExecute
end end
object actDataShowAll: TAction object actDataShowAll: TAction
Category = 'Data' Category = 'Data'
Caption = 'Show all' Caption = 'Show all'
Hint = 'Show all rows' Hint = 'Show all rows'
ImageIndex = 143 ImageIndex = 143
OnExecute = actDataShowAllExecute
ShortCut = 49187 ShortCut = 49187
OnExecute = actDataShowAllExecute
end end
object actRunRoutines: TAction object actRunRoutines: TAction
Category = 'Database' Category = 'Database'
@ -4606,8 +4606,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Set focused cell to NULL' Hint = 'Set focused cell to NULL'
ImageIndex = 92 ImageIndex = 92
OnExecute = actDataSetNullExecute
ShortCut = 24654 ShortCut = 24654
OnExecute = actDataSetNullExecute
end end
object actDataSaveBlobToFile: TAction object actDataSaveBlobToFile: TAction
Category = 'Data' Category = 'Data'
@ -4645,8 +4645,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Cancel running operation' Hint = 'Cancel running operation'
ImageIndex = 159 ImageIndex = 159
OnExecute = actCancelOperationExecute
ShortCut = 27 ShortCut = 27
OnExecute = actCancelOperationExecute
end end
object actToggleComment: TAction object actToggleComment: TAction
Category = 'SQL' Category = 'SQL'
@ -4672,8 +4672,8 @@ object MainForm: TMainForm
Caption = 'SQL function' Caption = 'SQL function'
Hint = 'Insert SQL function call in this grid cell, e.g. NOW()' Hint = 'Insert SQL function call in this grid cell, e.g. NOW()'
ImageIndex = 13 ImageIndex = 13
OnExecute = actGridEditFunctionExecute
ShortCut = 16497 ShortCut = 16497
OnExecute = actGridEditFunctionExecute
end end
object actLogHorizontalScrollbar: TAction object actLogHorizontalScrollbar: TAction
Category = 'Various' Category = 'Various'
@ -4706,78 +4706,78 @@ object MainForm: TMainForm
Category = 'Data' Category = 'Data'
Caption = 'Previous result tab' Caption = 'Previous result tab'
ImageIndex = 117 ImageIndex = 117
OnExecute = actPreviousResultExecute
ShortCut = 32805 ShortCut = 32805
OnExecute = actPreviousResultExecute
end end
object actNextResult: TAction object actNextResult: TAction
Category = 'Data' Category = 'Data'
Caption = 'Next result tab' Caption = 'Next result tab'
ImageIndex = 116 ImageIndex = 116
OnExecute = actNextResultExecute
ShortCut = 32807 ShortCut = 32807
OnExecute = actNextResultExecute
end end
object actSaveSynMemoToTextfile: TAction object actSaveSynMemoToTextfile: TAction
Category = 'Various' Category = 'Various'
Caption = 'Save as textfile...' Caption = 'Save as textfile...'
Hint = 'Save contents to a textfile' Hint = 'Save contents to a textfile'
ImageIndex = 10 ImageIndex = 10
ShortCut = 16467
OnExecute = actSaveSynMemoToTextfileExecute OnExecute = actSaveSynMemoToTextfileExecute
OnUpdate = ValidateControls OnUpdate = ValidateControls
ShortCut = 16467
end end
object actGotoDbTree: TAction object actGotoDbTree: TAction
Category = 'Various' Category = 'Various'
Caption = 'Database tree' Caption = 'Database tree'
OnExecute = actGotoDbTreeExecute
ShortCut = 16452 ShortCut = 16452
OnExecute = actGotoDbTreeExecute
end end
object actGotoFilter: TAction object actGotoFilter: TAction
Category = 'Various' Category = 'Various'
Caption = 'Table filter' Caption = 'Table filter'
OnExecute = actGotoFilterExecute
ShortCut = 16453 ShortCut = 16453
OnExecute = actGotoFilterExecute
end end
object actGotoTab1: TAction object actGotoTab1: TAction
Category = 'Various' Category = 'Various'
Caption = 'Tab 1' Caption = 'Tab 1'
OnExecute = actGotoTabNumberExecute
ShortCut = 16433 ShortCut = 16433
OnExecute = actGotoTabNumberExecute
end end
object actGotoTab2: TAction object actGotoTab2: TAction
Category = 'Various' Category = 'Various'
Caption = 'Tab 2' Caption = 'Tab 2'
OnExecute = actGotoTabNumberExecute
ShortCut = 16434 ShortCut = 16434
OnExecute = actGotoTabNumberExecute
end end
object actGotoTab3: TAction object actGotoTab3: TAction
Category = 'Various' Category = 'Various'
Caption = 'Tab 3' Caption = 'Tab 3'
OnExecute = actGotoTabNumberExecute
ShortCut = 16435 ShortCut = 16435
OnExecute = actGotoTabNumberExecute
end end
object actGotoTab4: TAction object actGotoTab4: TAction
Category = 'Various' Category = 'Various'
Caption = 'Tab 4' Caption = 'Tab 4'
OnExecute = actGotoTabNumberExecute
ShortCut = 16436 ShortCut = 16436
OnExecute = actGotoTabNumberExecute
end end
object actGotoTab5: TAction object actGotoTab5: TAction
Category = 'Various' Category = 'Various'
Caption = 'Tab 5' Caption = 'Tab 5'
OnExecute = actGotoTabNumberExecute
ShortCut = 16437 ShortCut = 16437
OnExecute = actGotoTabNumberExecute
end end
object actGoToQueryResults: TAction object actGoToQueryResults: TAction
Category = 'Various' Category = 'Various'
Caption = 'Switch to query/results' Caption = 'Switch to query/results'
OnExecute = actGoToQueryResultsExecute
ShortCut = 117 ShortCut = 117
OnExecute = actGoToQueryResultsExecute
end end
object actGoToDataMultiFilter: TAction object actGoToDataMultiFilter: TAction
Category = 'Various' Category = 'Various'
Caption = 'Multi column filter' Caption = 'Multi column filter'
OnExecute = actGoToDataMultiFilterExecute
ShortCut = 118 ShortCut = 118
OnExecute = actGoToDataMultiFilterExecute
end end
object actDataOpenUrl: TAction object actDataOpenUrl: TAction
Category = 'Data' Category = 'Data'
@ -4792,8 +4792,8 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Detach attached database' Hint = 'Detach attached database'
ImageIndex = 100 ImageIndex = 100
OnExecute = actDetachDatabaseExecute
Visible = False Visible = False
OnExecute = actDetachDatabaseExecute
end end
object actAttachDatabase: TAction object actAttachDatabase: TAction
Category = 'Database' Category = 'Database'
@ -4801,28 +4801,28 @@ object MainForm: TMainForm
Enabled = False Enabled = False
Hint = 'Attach new or existing database file' Hint = 'Attach new or existing database file'
ImageIndex = 101 ImageIndex = 101
OnExecute = actAttachDatabaseExecute
Visible = False Visible = False
OnExecute = actAttachDatabaseExecute
end end
object actSynEditCompletionPropose: TAction object actSynEditCompletionPropose: TAction
Category = 'SQL' Category = 'SQL'
Caption = 'Show SQL completion proposal' Caption = 'Show SQL completion proposal'
OnExecute = actSynEditCompletionProposeExecute
ShortCut = 16416 ShortCut = 16416
OnExecute = actSynEditCompletionProposeExecute
end end
object actQuickFilterFocused1: TAction object actQuickFilterFocused1: TAction
Category = 'Data' Category = 'Data'
Caption = 'Quick filter: Column = Focused' Caption = 'Quick filter: Column = Focused'
ImageIndex = 61 ImageIndex = 61
OnExecute = QuickFilterClick
ShortCut = 24625 ShortCut = 24625
OnExecute = QuickFilterClick
end end
object actQuickFilterFocused2: TAction object actQuickFilterFocused2: TAction
Category = 'Data' Category = 'Data'
Caption = 'Quick filter: Column != Focused' Caption = 'Quick filter: Column != Focused'
ImageIndex = 61 ImageIndex = 61
OnExecute = QuickFilterClick
ShortCut = 24626 ShortCut = 24626
OnExecute = QuickFilterClick
end end
object actQuickFilterFocused3: TAction object actQuickFilterFocused3: TAction
Category = 'Data' Category = 'Data'
@ -4858,15 +4858,15 @@ object MainForm: TMainForm
Category = 'Data' Category = 'Data'
Caption = 'Quick filter: Column = Prompt' Caption = 'Quick filter: Column = Prompt'
ImageIndex = 58 ImageIndex = 58
OnExecute = QuickFilterClick
ShortCut = 24627 ShortCut = 24627
OnExecute = QuickFilterClick
end end
object actQuickFilterPrompt2: TAction object actQuickFilterPrompt2: TAction
Category = 'Data' Category = 'Data'
Caption = 'Quick filter: Column != Prompt' Caption = 'Quick filter: Column != Prompt'
ImageIndex = 58 ImageIndex = 58
OnExecute = QuickFilterClick
ShortCut = 24628 ShortCut = 24628
OnExecute = QuickFilterClick
end end
object actQuickFilterPrompt3: TAction object actQuickFilterPrompt3: TAction
Category = 'Data' Category = 'Data'
@ -4902,15 +4902,15 @@ object MainForm: TMainForm
Category = 'Data' Category = 'Data'
Caption = 'Quick filter: Column = Clipboard' Caption = 'Quick filter: Column = Clipboard'
ImageIndex = 4 ImageIndex = 4
OnExecute = QuickFilterClick
ShortCut = 24629 ShortCut = 24629
OnExecute = QuickFilterClick
end end
object actQuickFilterClipboard2: TAction object actQuickFilterClipboard2: TAction
Category = 'Data' Category = 'Data'
Caption = 'Quick filter: Column != Clipboard' Caption = 'Quick filter: Column != Clipboard'
ImageIndex = 4 ImageIndex = 4
OnExecute = QuickFilterClick
ShortCut = 24630 ShortCut = 24630
OnExecute = QuickFilterClick
end end
object actQuickFilterClipboard3: TAction object actQuickFilterClipboard3: TAction
Category = 'Data' Category = 'Data'
@ -4985,22 +4985,22 @@ object MainForm: TMainForm
Category = 'SQL' Category = 'SQL'
Caption = 'Move line down' Caption = 'Move line down'
ImageIndex = 75 ImageIndex = 75
OnExecute = actSynMoveDownExecute
ShortCut = 32808 ShortCut = 32808
OnExecute = actSynMoveDownExecute
end end
object actSynMoveUp: TAction object actSynMoveUp: TAction
Category = 'SQL' Category = 'SQL'
Caption = 'Move line up' Caption = 'Move line up'
ImageIndex = 74 ImageIndex = 74
OnExecute = actSynMoveUpExecute
ShortCut = 32806 ShortCut = 32806
OnExecute = actSynMoveUpExecute
end end
object actSequalSuggest: TAction object actSequalSuggest: TAction
Category = 'Tools' Category = 'Tools'
Caption = 'Sequal Suggest' Caption = 'Sequal Suggest'
ImageIndex = 206 ImageIndex = 206
OnExecute = actSequalSuggestExecute
Visible = False Visible = False
OnExecute = actSequalSuggestExecute
end end
object actResetPanelDimensions: TAction object actResetPanelDimensions: TAction
Category = 'Tools' Category = 'Tools'
@ -20231,11 +20231,13 @@ object MainForm: TMainForm
OnExecute = SynCompletionProposalExecute OnExecute = SynCompletionProposalExecute
Position = -1 Position = -1
LinesInWindow = 6 LinesInWindow = 6
OnSearchPosition = SynCompletionProposalSearchPosition
OnPositionChanged = SynCompletionProposalChange OnPositionChanged = SynCompletionProposalChange
SelectedColor = clHighlight SelectedColor = clHighlight
CaseSensitive = False CaseSensitive = False
Width = 262 Width = 262
AutoUseSingleIdent = True ShowSizeDrag = True
AutoUseSingleIdent = False
ShortCut = 16416 ShortCut = 16416
EndOfTokenChr = '()[].' EndOfTokenChr = '()[].'
OnCodeCompletion = SynCompletionProposalCodeCompletion OnCodeCompletion = SynCompletionProposalCodeCompletion

165
source/main.pas
View File

@ -12,7 +12,7 @@ uses
StrUtils, laz.VirtualTrees, laz.VTHeaderPopup, RegExpr, StrUtils, laz.VirtualTrees, laz.VTHeaderPopup, RegExpr,
Buttons, StdCtrls, fphttpclient, Math, LCLIntf, Generics.Collections, Buttons, StdCtrls, fphttpclient, Math, LCLIntf, Generics.Collections,
Generics.Defaults, opensslsockets, StdActns, Clipbrd, Types, LCLType, EditBtn, Generics.Defaults, opensslsockets, StdActns, Clipbrd, Types, LCLType, EditBtn,
FileUtil, LMessages, jsonconf, DelphiCompat, dbconnection, dbstructures, dbstructures.mysql, FileUtil, LMessages, jsonconf, DelphiCompat, LazStringUtils, dbconnection, dbstructures, dbstructures.mysql,
generic_types, apphelpers, extra_controls, createdatabase, generic_types, apphelpers, extra_controls, createdatabase,
SynEditMarkupBracket, searchreplace, ImgList, IniFiles, LazFileUtils, tabletools, lazaruscompat; SynEditMarkupBracket, searchreplace, ImgList, IniFiles, LazFileUtils, tabletools, lazaruscompat;
@ -1137,7 +1137,9 @@ type
procedure StatusBarClick(Sender: TObject); procedure StatusBarClick(Sender: TObject);
procedure AnySynMemoMouseWheel(Sender: TObject; Shift: TShiftState; procedure AnySynMemoMouseWheel(Sender: TObject; Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
procedure SynMemoQueryKeyPress(Sender: TObject; var Key: Char); procedure SynCompletionProposalSearchPosition(var APosition: integer);
procedure SynMemoQueryProcessCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer);
procedure filterQueryHelpersChange(Sender: TObject); procedure filterQueryHelpersChange(Sender: TObject);
procedure TimerStoreTabsTimer(Sender: TObject); procedure TimerStoreTabsTimer(Sender: TObject);
procedure actGoToQueryResultsExecute(Sender: TObject); procedure actGoToQueryResultsExecute(Sender: TObject);
@ -1270,6 +1272,8 @@ type
FCommandStatsQueryCount: Int64; FCommandStatsQueryCount: Int64;
FCommandStatsServerUptime: Integer; FCommandStatsServerUptime: Integer;
FVariableNames, FSessionVars, FGlobalVars: TStringList; FVariableNames, FSessionVars, FGlobalVars: TStringList;
FProposalItems: TStringList;
FProposalTriggeredByDot: Boolean;
procedure SetDelimiter(Value: String); procedure SetDelimiter(Value: String);
procedure DisplayRowCountStats(Sender: TBaseVirtualTree); procedure DisplayRowCountStats(Sender: TBaseVirtualTree);
@ -2059,6 +2063,8 @@ begin
SynCompletionProposal.TimerInterval := AppSettings.ReadInt(asCompletionProposalInterval);} SynCompletionProposal.TimerInterval := AppSettings.ReadInt(asCompletionProposalInterval);}
SynCompletionProposal.Width := Min(AppSettings.ReadInt(asCompletionProposalWidth), 1000); SynCompletionProposal.Width := Min(AppSettings.ReadInt(asCompletionProposalWidth), 1000);
SynCompletionProposal.LinesInWindow := AppSettings.ReadInt(asCompletionProposalNbLinesInWindow); SynCompletionProposal.LinesInWindow := AppSettings.ReadInt(asCompletionProposalNbLinesInWindow);
FProposalItems := TStringList.Create;
FProposalTriggeredByDot := False;
// Place progressbar on the statusbar // Place progressbar on the statusbar
//ProgressBarStatus.Parent := StatusBar; //ProgressBarStatus.Parent := StatusBar;
@ -6775,6 +6781,7 @@ var
Param: TRoutineParam; Param: TRoutineParam;
DisplayText: String; DisplayText: String;
SQLFunc: TSQLFunction; SQLFunc: TSQLFunction;
DummyPos: Integer;
procedure AddTable(Obj: TDBObject); procedure AddTable(Obj: TDBObject);
var var
@ -6798,7 +6805,7 @@ var
end; end;
DisplayText := SynCompletionProposalPrettyText(Obj.ImageIndex, _(LowerCase(Obj.ObjType)), Obj.Name, FunctionDeclaration); DisplayText := SynCompletionProposalPrettyText(Obj.ImageIndex, _(LowerCase(Obj.ObjType)), Obj.Name, FunctionDeclaration);
Proposal.ItemList.Add(Obj.Name+FunctionDeclaration); FProposalItems.Add(Obj.Name+FunctionDeclaration);
end; end;
procedure AddColumns(const LeftToken: String); procedure AddColumns(const LeftToken: String);
@ -6841,7 +6848,7 @@ var
//if CurrentInput.StartsWith(Conn.QuoteChar) then //if CurrentInput.StartsWith(Conn.QuoteChar) then
// Proposal.ItemList.Add(Conn.QuoteChar + Col.Name) // Proposal.ItemList.Add(Conn.QuoteChar + Col.Name)
//else //else
Proposal.ItemList.Add(Col.Name); FProposalItems.Add(Col.Name);
Inc(ColumnsInList); Inc(ColumnsInList);
end; end;
Columns.Free; Columns.Free;
@ -6852,29 +6859,24 @@ var
begin begin
Proposal := Sender as TSynCompletion; Proposal := Sender as TSynCompletion;
{Proposal.Font.Assign(Font); Proposal.ItemList.Clear;
Proposal.TitleFont.Size := Proposal.Font.Size; FProposalItems.Clear;
Proposal.ItemHeight := ScaleSize(PROPOSAL_ITEM_HEIGHT);
Proposal.ClearList;
Proposal.Columns[0].ColumnWidth := ScaleSize(100); // Kind of random value, but fits well
Proposal.Columns[1].ColumnWidth := ScaleSize(100);}
Conn := ActiveConnection; Conn := ActiveConnection;
Editor := Proposal.Editor; Editor := Proposal.Editor;
Editor.GetHighlighterAttriAtRowColEx(Editor.PrevWordPos, Token, TokenTypeInt, Start, Attri);
//CanExecute := AppSettings.ReadBool(asCompletionProposal) and
// (not (TtkTokenKind(TokenTypeInt) in [SynHighlighterSQL.tkString, SynHighlighterSQL.tkComment]));
//if not CanExecute then
// Exit;
// Work around for issue #2640. See ApplicationDeActivate // Work around for issue #2640. See ApplicationDeActivate
//Proposal.Form.Enabled := True; Proposal.TheForm.Enabled := True;
rx := TRegExpr.Create; rx := TRegExpr.Create;
// Find token1.token2.token3, while cursor is somewhere in token3 // Find token1.token2.token3, while cursor is somewhere in token3
Ident := '[^\s,\(\)=\.]'; Ident := '[^\s,\(\)=\.]';
rx.Expression := '(('+Ident+'+)\.)?('+Ident+'+)\.('+Ident+'*)$'; rx.Expression := '(('+Ident+'+)\.)?('+Ident+'+)\.('+Ident+'*)$';
LeftPart := Copy(Editor.LineText, 1, Editor.CaretX-1); if FProposalTriggeredByDot then
LeftPart := Copy(Editor.LineText+'.', 1, Editor.CaretX)
else
LeftPart := Copy(Editor.LineText, 1, Editor.CaretX-1);
FProposalTriggeredByDot := False;
if rx.Exec(LeftPart) then begin if rx.Exec(LeftPart) then begin
Token1 := Conn.DeQuoteIdent(rx.Match[2]); Token1 := Conn.DeQuoteIdent(rx.Match[2]);
Token2 := Conn.DeQuoteIdent(rx.Match[3]); Token2 := Conn.DeQuoteIdent(rx.Match[3]);
@ -6889,7 +6891,7 @@ begin
Results := Conn.GetResults('SHOW '+UpperCase(rx.Match[1])+' VARIABLES'); Results := Conn.GetResults('SHOW '+UpperCase(rx.Match[1])+' VARIABLES');
while not Results.Eof do begin while not Results.Eof do begin
DisplayText := SynCompletionProposalPrettyText(ICONINDEX_PRIMARYKEY, _('Variable'), Results.Col(0), StringReplace(Results.Col(1), '\', '\\', [rfReplaceAll])); DisplayText := SynCompletionProposalPrettyText(ICONINDEX_PRIMARYKEY, _('Variable'), Results.Col(0), StringReplace(Results.Col(1), '\', '\\', [rfReplaceAll]));
Proposal.ItemList.Add(Results.Col(1)); FProposalItems.Add(Results.Col(1));
Results.Next; Results.Next;
end; end;
except except
@ -6986,7 +6988,7 @@ begin
// All databases // All databases
for i:=0 to Conn.AllDatabases.Count-1 do begin for i:=0 to Conn.AllDatabases.Count-1 do begin
DisplayText := SynCompletionProposalPrettyText(ICONINDEX_DB, _('database'), Conn.AllDatabases[i], ''); DisplayText := SynCompletionProposalPrettyText(ICONINDEX_DB, _('database'), Conn.AllDatabases[i], '');
Proposal.ItemList.Add(Conn.AllDatabases[i]); FProposalItems.Add(Conn.AllDatabases[i]);
end; end;
// Tables from current db // Tables from current db
@ -7003,14 +7005,14 @@ begin
// Functions // Functions
for SQLFunc in Conn.SQLFunctions do begin for SQLFunc in Conn.SQLFunctions do begin
DisplayText := SynCompletionProposalPrettyText(ICONINDEX_FUNCTION, _('function'), SQLFunc.Name, SQLFunc.Declaration); DisplayText := SynCompletionProposalPrettyText(ICONINDEX_FUNCTION, _('function'), SQLFunc.Name, SQLFunc.Declaration);
Proposal.ItemList.Add(SQLFunc.Name + SQLFunc.Declaration); FProposalItems.Add(SQLFunc.Name + SQLFunc.Declaration);
end; end;
// Keywords // Keywords
for i:=0 to MySQLKeywords.Count-1 do begin for i:=0 to MySQLKeywords.Count-1 do begin
DisplayText := SynCompletionProposalPrettyText(ICONINDEX_KEYWORD, _('keyword'), MySQLKeywords[i], ''); DisplayText := SynCompletionProposalPrettyText(ICONINDEX_KEYWORD, _('keyword'), MySQLKeywords[i], '');
Proposal.ItemList.Add(MySQLKeywords[i]); FProposalItems.Add(MySQLKeywords[i]);
end; end;
// Procedure params // Procedure params
@ -7022,7 +7024,7 @@ begin
else if Param.Context = 'INOUT' then ImageIndex := 122 else if Param.Context = 'INOUT' then ImageIndex := 122
else ImageIndex := -1; else ImageIndex := -1;
DisplayText := SynCompletionProposalPrettyText(ImageIndex, Param.Datatype, Param.Name, ''); DisplayText := SynCompletionProposalPrettyText(ImageIndex, Param.Datatype, Param.Name, '');
Proposal.ItemList.Add(Param.Name); FProposalItems.Add(Param.Name);
end; end;
end; end;
@ -7031,6 +7033,58 @@ begin
end; end;
rx.Free; rx.Free;
// Filter items to current string:
SynCompletionProposalSearchPosition(DummyPos);
end;
procedure TMainForm.SynCompletionProposalSearchPosition(var APosition: integer);
var
Proposal: TSynCompletion;
i: Integer;
CurrentStr: String;
SearchOnMid: Boolean;
begin
Proposal := SynCompletionProposal;
Proposal.ItemList.BeginUpdate;
Proposal.ItemList.Clear;
CurrentStr := Proposal.CurrentString;
SearchOnMid := AppSettings.ReadBool(asCompletionProposalSearchOnMid);
//logsql('SynCompletionProposalSearchPosition CurrentString:'+CurrentStr+' StartsText:');
for i:=0 to FProposalItems.Count-1 do begin
if CurrentStr.IsEmpty
or (SearchOnMid and LowerCase(FProposalItems[i]).Contains(LowerCase(CurrentStr)))
or ((not SearchOnMid) and LazStartsText(CurrentStr, FProposalItems[i]))
then
Proposal.ItemList.Add(FProposalItems[i]);
end;
Proposal.ItemList.EndUpdate;
end;
procedure TMainForm.SynMemoQueryProcessCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer);
var
Editor: TSynMemo;
CaretToken: String;
CaretStart, CaretTokenTypeInt: Integer;
CaretAttri: TSynHighlighterAttributes;
Proposal: TSynCompletion;
p: TPoint;
begin
if AChar = '.' then begin
if not AppSettings.ReadBool(asCompletionProposal) then
Exit;
Editor := Sender as TSynMemo;
Editor.GetHighlighterAttriAtRowColEx(Editor.CaretXY, CaretToken, CaretTokenTypeInt, CaretStart, CaretAttri);
if not (TtkTokenKind(CaretTokenTypeInt) in [SynHighlighterSQL.tkString, SynHighlighterSQL.tkComment])
then begin
Proposal := SynCompletionProposal;
p := Editor.ClientToScreen(Point(Editor.CaretXPix, Editor.CaretYPix + Editor.LineHeight + 1));
Proposal.Editor := Editor;
FProposalTriggeredByDot := True;
Proposal.Execute('', p.x, p.y);
end;
end;
end; end;
@ -7627,72 +7681,6 @@ begin
end; end;
procedure TMainForm.SynMemoQueryKeyPress(Sender: TObject; var Key: Char);
{var
Editor: TSynMemo;
Token, Replacement: String;
Attri: TSynHighlighterAttributes;
OldCaretXY, StartOfTokenRowCol, EndOfTokenRowCol, CurrentRowCol: TPoint;
TokenTypeInt, Start, CurrentCharIndex: Integer;
//OldSelStart, OldSelEnd: Integer;
LineWithToken: String;
TableIndex, ProcIndex: Integer;
OldOnChange: TNotifyEvent;
const
WordChars = ['A'..'Z', 'a'..'z', '_'];
IgnoreChars = [#8]; // Backspace, and probably more which should not trigger uppercase}
begin
// Uppercase reserved words, functions and data types
{if CharInSet(Key, WordChars) or CharInSet(Key, IgnoreChars) then
Exit;
if not AppSettings.ReadBool(asAutoUppercase) then
Exit;
Editor := Sender as TSynMemo;
CurrentCharIndex := Editor.RowColToCharIndex(Editor.CaretXY);
// Go one left on trailing line feed, after which PrevWordPos doesn't work
Dec(CurrentCharIndex, 1);
CurrentRowCol := Editor.CharIndexToRowCol(CurrentCharIndex);
StartOfTokenRowCol := Editor.PrevWordPos;
Editor.GetHighlighterAttriAtRowColEx(StartOfTokenRowCol, Token, TokenTypeInt, Start, Attri);
Replacement := UpperCase(Token);
// Check if token is preceded by a dot, so it is most probably a table, column or some alias
LineWithToken := Editor.Lines[StartOfTokenRowCol.Y-1];
if (StartOfTokenRowCol.X > 1) and (LineWithToken[StartOfTokenRowCol.X-1] = '.') then begin
Exit;
end;
// Auto-fix case of known database objects
TableIndex := SynSQLSynUsed.TableNames.IndexOf(Token);
ProcIndex := SynSQLSynUsed.ProcNames.IndexOf(Token);
if TableIndex > -1 then begin
Replacement := SynSQLSynUsed.TableNames[TableIndex];
end else if ProcIndex > -1 then begin
Replacement := SynSQLSynUsed.ProcNames[ProcIndex];
end else if not (TtkTokenKind(TokenTypeInt) in [tkDatatype, tkFunction, tkKey]) then begin
// Only uppercase certain types of keywords
Exit;
end;
if Token <> Replacement then begin
OldCaretXY := Editor.CaretXY;
//OldSelStart := Editor.SelStart;
//OldSelEnd := Editor.SelEnd;
EndOfTokenRowCol := Editor.WordEndEx(StartOfTokenRowCol);
OldOnChange := Editor.OnChange;
Editor.OnChange := nil;
Editor.InsertBlock(StartOfTokenRowCol, EndOfTokenRowCol, PWideChar(Replacement), True);
Editor.OnChange := OldOnChange;
Editor.CaretXY := OldCaretXY;
//Editor.SelStart := OldSelStart; // breaks at least some undo steps
//Editor.SelEnd := OldSelEnd;
end;}
end;
procedure TMainForm.AnySynMemoMouseWheel(Sender: TObject; Shift: TShiftState; procedure TMainForm.AnySynMemoMouseWheel(Sender: TObject; Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
var var
@ -12309,6 +12297,7 @@ begin
QueryTab.Memo.OnDropFiles := SynMemoQuery.OnDropFiles; QueryTab.Memo.OnDropFiles := SynMemoQuery.OnDropFiles;
QueryTab.Memo.OnKeyPress := SynMemoQuery.OnKeyPress; QueryTab.Memo.OnKeyPress := SynMemoQuery.OnKeyPress;
QueryTab.Memo.OnMouseWheel := SynMemoQuery.OnMouseWheel; QueryTab.Memo.OnMouseWheel := SynMemoQuery.OnMouseWheel;
QueryTab.Memo.OnProcessCommand := SynMemoQuery.OnProcessCommand;
QueryTab.Memo.OnReplaceText := SynMemoQuery.OnReplaceText; QueryTab.Memo.OnReplaceText := SynMemoQuery.OnReplaceText;
//QueryTab.Memo.OnPaintTransient := SynMemoQuery.OnPaintTransient; //QueryTab.Memo.OnPaintTransient := SynMemoQuery.OnPaintTransient;
//QueryTab.Memo.OnTokenHint := SynMemoQuery.OnTokenHint; //QueryTab.Memo.OnTokenHint := SynMemoQuery.OnTokenHint;