diff --git a/source/copytable.pas b/source/copytable.pas index 9f58ebab..236c9391 100644 --- a/source/copytable.pas +++ b/source/copytable.pas @@ -167,7 +167,7 @@ var Results : TMySQLQuery; isFulltext : Boolean; struc_data : Byte; - Fixes : TWideStringlist; + Fixes : TStringList; DBObjects : TDBObjectList; begin // copy table! @@ -202,8 +202,8 @@ begin begin setlength(keylist, length(keylist)+1); which := high(keylist); - keylist[which].Columns := TWideStringList.Create; - keylist[which].SubParts := TWideStringList.Create; + keylist[which].Columns := TStringList.Create; + keylist[which].SubParts := TStringList.Create; // set properties for new key if Mainform.Connection.ServerVersionInt < 40002 then isFulltext := Results.Col('Comment') = 'FULLTEXT' @@ -284,7 +284,7 @@ begin // Fix missing auto_increment property and CURRENT_TIMESTAMP defaults in new table Results := Mainform.Connection.GetResults('SHOW FIELDS FROM ' + mainform.mask(oldtablename)); - Fixes := TWideStringlist.Create; + Fixes := TStringList.Create; while not Results.Eof do begin notnull := ''; if Results.Col('Null') = '' then diff --git a/source/createdatabase.pas b/source/createdatabase.pas index fd91ca06..44a8e9d2 100644 --- a/source/createdatabase.pas +++ b/source/createdatabase.pas @@ -204,7 +204,7 @@ end; procedure TCreateDatabaseForm.btnOKClick(Sender: TObject); var sql : String; - AllDatabases, Unions, ObjectsLeft: TWideStringList; + AllDatabases, Unions, ObjectsLeft: TStringList; ObjectsInNewDb, ObjectsInOldDb: TDBObjectList; i, j: Integer; begin @@ -274,9 +274,9 @@ begin Mainform.Connection.ClearDbObjects(editDBName.Text); end; // Last step for renaming: drop source database - ObjectsLeft := TWideStringList.Create; + ObjectsLeft := TStringList.Create; // Last check if old db is really empty, before we drop it. Especially triggers need to be checked. - Unions := TWideStringList.Create; + Unions := TStringList.Create; if Mainform.Connection.InformationSchemaObjects.IndexOf('TABLES') > -1 then Unions.Add('SELECT 1 FROM '+Mainform.mask(DBNAME_INFORMATION_SCHEMA)+'.TABLES WHERE TABLE_SCHEMA='+esc(modifyDB)); if Mainform.Connection.InformationSchemaObjects.IndexOf('ROUTINES') > -1 then diff --git a/source/data_sorting.pas b/source/data_sorting.pas index 21d7e8f9..df7b2fff 100644 --- a/source/data_sorting.pas +++ b/source/data_sorting.pas @@ -25,7 +25,7 @@ type procedure btnResetClick(Sender: TObject); private { Private declarations } - ColumnNames : TWideStringList; + ColumnNames : TStringList; OrderColumns : TOrderColArray; OldOrderClause : String; procedure DisplaySortingControls; @@ -54,7 +54,7 @@ uses main; procedure TDataSortingForm.FormCreate(Sender: TObject); begin InheritFont(Font); - ColumnNames := TWideStringlist.Create; + ColumnNames := TStringList.Create; FColumns := TTableColumnList.Create; end; @@ -273,14 +273,14 @@ end; procedure TDataSortingForm.btnAddColClick(Sender: TObject); var i, new : Integer; - UnusedColumns : TWideStringList; + UnusedColumns : TStringList; begin SetLength( OrderColumns, Length(OrderColumns)+1 ); new := Length(OrderColumns)-1; OrderColumns[new] := TOrderCol.Create; // Take first unused column as default for new sort column - UnusedColumns := TWideStringList.Create; + UnusedColumns := TStringList.Create; UnusedColumns.AddStrings( ColumnNames ); for i := 0 to Length(OrderColumns) - 1 do begin diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas index 33f93de9..5c8934c4 100644 --- a/source/grideditlinks.pas +++ b/source/grideditlinks.pas @@ -84,7 +84,7 @@ type private FCombo: TComboBox; public - ValueList: TWideStringList; + ValueList: TStringList; AllowCustomText: Boolean; constructor Create(Tree: TVirtualStringTree); override; destructor Destroy; override; @@ -100,7 +100,7 @@ type FCheckList: TCheckListBox; FBtnOK, FBtnCancel: TButton; public - ValueList: TWideStringList; + ValueList: TStringList; constructor Create(Tree: TVirtualStringTree); override; destructor Destroy; override; function BeginEdit: Boolean; override; @@ -683,7 +683,7 @@ begin FCombo.Parent := FParentForm; FCombo.OnKeyDown := DoKeyDown; FCombo.OnExit := DoEndEdit; - ValueList := TWideStringList.Create; + ValueList := TStringList.Create; FMainControl := FCombo; end; @@ -744,7 +744,7 @@ end; constructor TSetEditorLink.Create(Tree: TVirtualStringTree); begin inherited Create(Tree); - ValueList := TWideStringList.Create; + ValueList := TStringList.Create; FPanel := TPanel.Create(FParentForm); FPanel.Hide; @@ -803,7 +803,7 @@ end; function TSetEditorLink.PrepareEdit(Tree: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex): Boolean; stdcall; var - SelValues: TWideStringlist; + SelValues: TStringList; begin Result := inherited PrepareEdit(Tree, Node, Column); if not Result then @@ -811,7 +811,7 @@ begin FCheckList.Font.Assign(FCellFont); FCheckList.Items.Assign(ValueList); - SelValues := TWideStringList.Create; + SelValues := TStringList.Create; SelValues.Delimiter := ','; SelValues.StrictDelimiter := True; SelValues.DelimitedText := FCellText; diff --git a/source/helpers.pas b/source/helpers.pas index 34ad04cd..c1c3b748 100644 --- a/source/helpers.pas +++ b/source/helpers.pas @@ -18,7 +18,7 @@ type // Define a record which can hold everything we need for one row / node in a VirtualStringTree TVTreeData = record - Captions: TWideStringList; + Captions: TStringList; ImageIndex: Integer; NodeType: TListNodeType; end; @@ -46,7 +46,7 @@ type DatatypeCat: TDatatypeCategoryIndex; MaxLength: Cardinal; IsPriPart: Boolean; - ValueList: TWideStringList; + ValueList: TStringList; end; PGridColumn = ^TGridColumn; TGridColumns = Array of TGridColumn; @@ -82,8 +82,8 @@ type TMyKey = record Name : String; _type : String; - Columns : TWideStringList; - SubParts : TWideStringList; + Columns : TStringList; + SubParts : TStringList; end; // General purpose editing status flag @@ -114,7 +114,7 @@ type TTableKey = class(TObject) Name, OldName: String; IndexType: String; - Columns, SubParts: TWideStringlist; + Columns, SubParts: TStringList; Modified, Added: Boolean; constructor Create; destructor Destroy; override; @@ -125,7 +125,7 @@ type // Helper object to manage foreign keys in a TObjectList TForeignKey = class(TObject) KeyName, ReferenceTable, OnUpdate, OnDelete: String; - Columns, ForeignColumns: TWideStringList; + Columns, ForeignColumns: TStringList; Modified, Added: Boolean; constructor Create; destructor Destroy; override; @@ -150,15 +150,15 @@ type {$I const.inc} - function implodestr(seperator: String; a: TWideStringList) :String; - function explode(separator, a: String) :TWideStringList; - procedure ExplodeQuotedList(Text: String; var List: TWideStringList); + function implodestr(seperator: String; a: TStringList) :String; + function explode(separator, a: String) :TStringList; + procedure ExplodeQuotedList(Text: String; var List: TStringList); procedure ensureValidIdentifier(name: String); function getEnumValues(str: String): String; function IsWhitespace(const c: WideChar): Boolean; function IsLetter(const c: WideChar): Boolean; function IsNumber(const c: WideChar): Boolean; - function parsesql(sql: String) : TWideStringList; + function parsesql(sql: String) : TStringList; function sstr(str: String; len: Integer) : String; function encrypt(str: String): String; function decrypt(str: String): String; @@ -174,7 +174,7 @@ type procedure StreamWrite(S: TStream; Text: String = ''); function fixSQL( sql: String; sql_version: Integer = SQL_VERSION_ANSI; cli_workarounds: Boolean = false ): String; procedure ToggleCheckListBox(list: TCheckListBox; state: Boolean); Overload; - procedure ToggleCheckListBox(list: TCheckListBox; state: Boolean; list_toggle: TWideStringList); Overload; + procedure ToggleCheckListBox(list: TCheckListBox; state: Boolean; list_toggle: TStringList); Overload; function _GetFileSize(filename: String): Int64; function Mince(PathToMince: String; InSpace: Integer): String; function MakeInt( Str: String ) : Int64; @@ -200,8 +200,8 @@ type function FormatByteNumber( Bytes: Int64; Decimals: Byte = 1 ): String; Overload; function FormatByteNumber( Bytes: String; Decimals: Byte = 1 ): String; Overload; function FormatTimeNumber( Seconds: Cardinal ): String; - function GetVTCaptions( VT: TVirtualStringTree; OnlySelected: Boolean = False; Column: Integer = 0; OnlyNodeTypes: TListNodeTypes = [lntNone] ): TWideStringList; - procedure SetVTSelection( VT: TVirtualStringTree; Selected: TWideStringList ); + function GetVTCaptions( VT: TVirtualStringTree; OnlySelected: Boolean = False; Column: Integer = 0; OnlyNodeTypes: TListNodeTypes = [lntNone] ): TStringList; + procedure SetVTSelection( VT: TVirtualStringTree; Selected: TStringList ); function GetTempDir: String; procedure SetWindowSizeGrip(hWnd: HWND; Enable: boolean); procedure SaveUnicodeFile(Filename: String; Text: String); @@ -306,7 +306,7 @@ end; @param a TStringList Containing strings @return string } -function implodestr(seperator: String; a: TWideStringList) :String; +function implodestr(seperator: String; a: TStringList) :String; var i : Integer; begin @@ -327,12 +327,12 @@ end; @param string Separator @return TStringList } -function explode(separator, a: String) :TWideStringList; +function explode(separator, a: String) :TStringList; var i : Integer; item : String; begin - result := TWideStringList.Create; + result := TStringList.Create; i := pos(separator, a); while i > 0 do begin @@ -453,7 +453,7 @@ end; @param string to enclose added string in (use %s) @return void } -procedure addResult(list: TWideStringList; s: String; enclose: String = ''); +procedure addResult(list: TStringList; s: String; enclose: String = ''); begin s := trim(s); if length(s) > 0 then begin @@ -537,7 +537,7 @@ end; @param String SQL start delimiter @return TStringList Separated statements } -function parsesql(sql: String) : TWideStringList; +function parsesql(sql: String) : TStringList; var i, j, start, len : Integer; tmp : String; @@ -548,7 +548,7 @@ var encloser, secchar, thdchar : WideChar; conditional : String; begin - result := TWideStringList.Create; + result := TStringList.Create; sql := trim(sql); instring := false; start := 1; @@ -1392,7 +1392,7 @@ end; @param TStringList Second list with items to change @return void } -procedure ToggleCheckListBox(list: TCheckListBox; state: Boolean; list_toggle: TWideStringList); +procedure ToggleCheckListBox(list: TCheckListBox; state: Boolean; list_toggle: TStringList); var i : Integer; begin @@ -2033,12 +2033,12 @@ end; Return a TStringList with captions from all selected nodes in a VirtualTree Especially helpful when toMultiSelect is True } -function GetVTCaptions( VT: TVirtualStringTree; OnlySelected: Boolean = False; Column: Integer = 0; OnlyNodeTypes: TListNodeTypes = [lntNone] ): TWideStringList; +function GetVTCaptions( VT: TVirtualStringTree; OnlySelected: Boolean = False; Column: Integer = 0; OnlyNodeTypes: TListNodeTypes = [lntNone] ): TStringList; var Node: PVirtualNode; NodeData: PVTreeData; begin - Result := TWideStringList.Create; + Result := TStringList.Create; if OnlySelected then Node := VT.GetFirstSelected else Node := VT.GetFirst; while Assigned(Node) do begin @@ -2059,7 +2059,7 @@ end; The opposite of GetVTCaptions in "OnlySelected"-Mode: Set selected nodes in a VirtualTree } -procedure SetVTSelection( VT: TVirtualStringTree; Selected: TWideStringList ); +procedure SetVTSelection( VT: TVirtualStringTree; Selected: TStringList ); var Node: PVirtualNode; NodeData: PVTreeData; @@ -2721,7 +2721,7 @@ begin end; -procedure ExplodeQuotedList(Text: String; var List: TWideStringList); +procedure ExplodeQuotedList(Text: String; var List: TStringList); var i: Integer; Quote: WideChar; @@ -2994,14 +2994,14 @@ end; function ReformatSQL(SQL: String): String; var - AllKeywords, ImportantKeywords: TWideStringlist; + AllKeywords, ImportantKeywords: TStringList; i, Run, KeywordMaxLen: Integer; IsEsc, IsQuote, InComment, InBigComment, InString, InKeyword, InIdent, LastWasComment: Boolean; c, p: WideChar; Keyword, PreviousKeyword, TestPair: String; begin // Known SQL keywords, get converted to UPPERCASE - AllKeywords := TWideStringlist.Create; + AllKeywords := TStringList.Create; AllKeywords.Text := MySQLKeywords.Text; for i:=Low(MySQLFunctions) to High(MySQLFunctions) do begin if MySQLFunctions[i].Declaration <> '' then @@ -3122,8 +3122,8 @@ end; constructor TTableKey.Create; begin inherited Create; - Columns := TWideStringlist.Create; - SubParts := TWideStringlist.Create; + Columns := TStringList.Create; + SubParts := TStringList.Create; Columns.OnChange := Modification; Subparts.OnChange := Modification; end; @@ -3147,8 +3147,8 @@ end; constructor TForeignKey.Create; begin inherited Create; - Columns := TWideStringlist.Create; - ForeignColumns := TWideStringlist.Create; + Columns := TStringList.Create; + ForeignColumns := TStringList.Create; end; destructor TForeignKey.Destroy; diff --git a/source/loaddata.pas b/source/loaddata.pas index e464ba47..bc4dc102 100644 --- a/source/loaddata.pas +++ b/source/loaddata.pas @@ -213,7 +213,7 @@ end; procedure Tloaddataform.btnImportClick(Sender: TObject); var query : String; - col : TWideStringList; + col : TStringList; i : Integer; // Correctly escape field-terminator, line-terminator or encloser @@ -278,7 +278,7 @@ begin if updownIgnoreLines.Position > 0 then query := query + 'IGNORE ' + inttostr(updownIgnoreLines.Position) + ' LINES '; - col := TWideStringList.Create; + col := TStringList.Create; for i:=0 to chklistColumns.Items.Count - 1 do begin if chklistColumns.checked[i] then diff --git a/source/main.pas b/source/main.pas index 0a3a8939..a497be70 100644 --- a/source/main.pas +++ b/source/main.pas @@ -736,9 +736,9 @@ type function GetActiveDatabase: String; function GetSelectedTable: TDBObject; procedure SetSelectedDatabase(db: String); - procedure SetVisibleListColumns( List: TVirtualStringTree; Columns: TWideStringList ); + procedure SetVisibleListColumns( List: TVirtualStringTree; Columns: TStringList ); procedure ToggleFilterPanel(ForceVisible: Boolean = False); - procedure AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: TWideStringlist = nil); + procedure AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: TStringList = nil); function PlaceObjectEditor(Which: TListNodeType): TDBObjectEditor; procedure SetTabCaption(PageIndex: Integer; Text: String); function ConfirmTabClose(PageIndex: Integer): Boolean; @@ -749,8 +749,8 @@ type Connection: TMySQLConnection; SessionName: String; virtualDesktopName: string; - AllDatabases: TWideStringList; - Databases: TWideStringList; + AllDatabases: TStringList; + Databases: TStringList; btnAddTab: TPngSpeedButton; QueryTabs: TObjectList; @@ -796,7 +796,7 @@ type prefNullBG: TColor; // Data grid related stuff - FDataGridSelect: TWideStringList; + FDataGridSelect: TStringList; FDataGridSort: TOrderColArray; FDataGridFocusedNodeIndex: Cardinal; FDataGridFocusedColumnIndex: TColumnIndex; @@ -814,7 +814,7 @@ type SelectedTableKeys: TTableKeyList; SelectedTableForeignKeys: TForeignKeyList; FilterPanelManuallyOpened: Boolean; - PrevTableColWidths: TWideStringList; + PrevTableColWidths: TStringList; // Executable file details AppVerMajor: Integer; @@ -860,7 +860,7 @@ type function DataGridPostUpdateOrInsert(Node: PVirtualNode): Boolean; procedure GridFinalizeEditing(Sender: TBaseVirtualTree); function GetWhereClause(Row: PGridRow; Columns: PGridColumns): String; - function GetKeyColumns: TWideStringlist; + function GetKeyColumns: TStringList; function CheckUniqueKeyClause: Boolean; procedure DataGridInsertRow(CopyValuesFromNode: PVirtualNode); procedure DataGridCancel(Sender: TObject); @@ -1934,7 +1934,7 @@ end; // Quote identifier, probably with multiple segments, e.g. db.table.column function TMainform.MaskMulti(str: String): String; var - Segments: TWideStringlist; + Segments: TStringList; i: Integer; begin Segments := Explode('.', str); @@ -2166,13 +2166,13 @@ end; procedure TMainForm.actDropObjectsExecute(Sender: TObject); var AllCount : Integer; - Tables, Views, Functions, Procedures, Triggers: TWideStringList; + Tables, Views, Functions, Procedures, Triggers: TStringList; msg, activeDB : String; InDBTree: Boolean; Act: TAction; Node: PVirtualNode; - procedure DoDrop(Kind: String; List: TWideStringlist; MultiDrops: Boolean); + procedure DoDrop(Kind: String; List: TStringList; MultiDrops: Boolean); var i: Integer; baseSql, sql: String; @@ -2200,11 +2200,11 @@ begin // Can be overwritten when someone selects a table in dbtree from different database activeDB := ActiveDatabase; - Tables := TWideStringlist.Create; - Views := TWideStringlist.Create; - Procedures := TWideStringlist.Create; - Functions := TWideStringlist.Create; - Triggers := TWideStringlist.Create; + Tables := TStringList.Create; + Views := TStringList.Create; + Procedures := TStringList.Create; + Functions := TStringList.Create; + Triggers := TStringList.Create; Act := Sender as TAction; InDBTree := (Act.ActionComponent is TMenuItem) @@ -2475,7 +2475,7 @@ end; procedure TMainForm.actEmptyTablesExecute(Sender: TObject); var - t: TWideStringList; + t: TStringList; i: Integer; sql_pattern: String; begin @@ -2483,7 +2483,7 @@ begin if ListTables.Focused then t := GetVTCaptions(ListTables, True) else if DBTree.Focused then begin - t := TWideStringList.Create; + t := TStringList.Create; t.Add(SelectedTable.Name); end else Exit; @@ -3193,8 +3193,8 @@ var select_base, select_base_full, select_from : String; - sl_query : TWideStringList; - KeyCols : TWideStringList; + sl_query : TStringList; + KeyCols : TStringList; col : TVirtualTreeColumn; ColExists, ShowIt : Boolean; OldOffsetXY : TPoint; @@ -3243,13 +3243,13 @@ begin end; end; dtcIntegerNamed: begin - DataGridResult.Columns[idx].ValueList := TWideStringList.Create; + DataGridResult.Columns[idx].ValueList := TStringList.Create; DataGridResult.Columns[idx].ValueList.QuoteChar := ''''; DataGridResult.Columns[idx].ValueList.Delimiter := ','; DataGridResult.Columns[idx].ValueList.DelimitedText := Column.LengthSet; end; dtcSetNamed: begin - DataGridResult.Columns[idx].ValueList := TWideStringList.Create; + DataGridResult.Columns[idx].ValueList := TStringList.Create; DataGridResult.Columns[idx].ValueList.QuoteChar := ''''; DataGridResult.Columns[idx].ValueList.Delimiter := ','; DataGridResult.Columns[idx].ValueList.DelimitedText := Column.LengthSet; @@ -3271,7 +3271,7 @@ begin if (SelectedTable.Name = '') or (ActiveDatabase = '') then Exit; Screen.Cursor := crHourglass; - sl_query := TWideStringList.Create(); + sl_query := TStringList.Create(); // Ensure grid has left editing mode so DataGrid.OnNewText applies its changes // to the old data, not to the new or some non referenced data @@ -3511,7 +3511,7 @@ var i, img, NumObj: Integer; Obj: TDBObject; Objects: TDBObjectList; - Cap, SelectedCaptions, NumObjects: TWideStringList; + Cap, SelectedCaptions, NumObjects: TStringList; Msg: String; begin // DB-Properties @@ -3521,7 +3521,7 @@ begin SelectedCaptions := GetVTCaptions(ListTables, True); Objects := Connection.GetDBObjects(db); - NumObjects := TWideStringList.Create; + NumObjects := TStringList.Create; ShowStatus( 'Displaying objects from "' + db + '" ...' ); ListTables.BeginUpdate; @@ -3530,7 +3530,7 @@ begin SetLength(VTRowDataListTables, Objects.Count); for i:=0 to Objects.Count-1 do begin Obj := Objects[i]; - VTRowDataListTables[i].Captions := TWideStringList.Create; + VTRowDataListTables[i].Captions := TStringList.Create; Cap := VTRowDataListTables[i].Captions; // Object name Cap.Add(Obj.Name); @@ -3737,7 +3737,7 @@ end; procedure TMainForm.KillProcess(Sender: TObject); var t : Boolean; - ProcessIDs : TWideStringList; + ProcessIDs : TStringList; i : Integer; begin t := TimerRefresh.Enabled; @@ -3766,7 +3766,7 @@ end; procedure TMainForm.ExecSQLClick(Sender: TObject; Selection: Boolean=false; CurrentLine: Boolean=false); var - SQL: TWideStringList; + SQL: TStringList; i, j, QueryCount: Integer; SQLTime, SQLNetTime: Cardinal; Results: TMySQLQuery; @@ -3941,7 +3941,7 @@ var Attri : TSynHighlighterAttributes; Proposal : TSynCompletionProposal; Editor : TCustomSynEdit; - Queries : TWideStringList; + Queries : TStringList; procedure addTable(Obj: TDBObject); var Icon: Integer; @@ -5330,10 +5330,10 @@ end; procedure TMainForm.MenuTablelistColumnsClick(Sender: TObject); var menuitem : TMenuItem; - VisibleColumns : TWideStringList; + VisibleColumns : TStringList; i : Integer; begin - VisibleColumns := TWideStringList.Create; + VisibleColumns := TStringList.Create; menuitem := TMenuItem( Sender ); menuitem.Checked := not menuitem.Checked; for i := 0 to ListTables.Header.Columns.Count - 1 do @@ -5404,11 +5404,11 @@ var i : Byte; colwidth, colpos : Integer; Value : String; - ValueList : TWideStringList; + ValueList : TStringList; Regname: String; frm: TCustomForm; begin - ValueList := TWideStringList.Create; + ValueList := TStringList.Create; // Column widths Regname := List.Name; @@ -5454,7 +5454,7 @@ end; {** (Un)hide columns in a VirtualStringTree. } -procedure TMainForm.SetVisibleListColumns( List: TVirtualStringTree; Columns: TWideStringList ); +procedure TMainForm.SetVisibleListColumns( List: TVirtualStringTree; Columns: TStringList ); var i : Integer; begin @@ -5894,7 +5894,7 @@ procedure TMainForm.DBtreeInitChildren(Sender: TBaseVirtualTree; Node: var VT: TVirtualStringTree; i, j: Integer; - DatabasesWanted: TWideStringList; + DatabasesWanted: TStringList; rx: TRegExpr; FilterError: Boolean; begin @@ -5909,7 +5909,7 @@ begin AllDatabases := Connection.GetCol('SHOW DATABASES'); end; if not Assigned(Databases) then - Databases := TWideStringList.Create; + Databases := TStringList.Create; Databases.Clear; DatabasesWanted := Explode(';', comboOnlyDBs.Text); FilterError := False; @@ -6792,7 +6792,7 @@ function TMainForm.GetWhereClause(Row: PGridRow; Columns: PGridColumns): String; var i, j: Integer; KeyVal: String; - KeyCols: TWideStringlist; + KeyCols: TStringList; begin Result := ''; KeyCols := GetKeyColumns; @@ -6822,14 +6822,14 @@ end; {** Find key columns for a WHERE clause by analysing a SHOW KEYS FROM ... resultset } -function TMainForm.GetKeyColumns: TWideStringlist; +function TMainForm.GetKeyColumns: TStringList; var i, j, k: Integer; AllowsNull: Boolean; Key: TTableKey; Col: TTableColumn; begin - Result := TWideStringlist.Create; + Result := TStringList.Create; // Find best key for updates // 1. round: find a primary key for i:=0 to SelectedTableKeys.Count-1 do begin @@ -7222,7 +7222,7 @@ begin end; -procedure TMainForm.AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: TWideStringlist = nil); +procedure TMainForm.AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: TStringList = nil); var Node: PVirtualNode; i, j, ColTextWidth: Integer; @@ -7295,7 +7295,7 @@ begin if tsUpdating in Sender.Treeview.TreeStates then Exit; if PrevTableColWidths = nil then - PrevTableColWidths := TWideStringList.Create; + PrevTableColWidths := TStringList.Create; col := Sender.Columns[Column]; PrevTableColWidths.Values[col.Text] := inttostr(col.Width); end; @@ -7333,7 +7333,7 @@ var rx: TRegExpr; idx, i: Integer; Col: TTableColumn; - HiddenCols: TWideStringList; + HiddenCols: TStringList; TestList: TStringList; Sort: String; begin @@ -7344,14 +7344,14 @@ begin FDataGridFocusedColumnIndex := 0; // Clear filter, column names and sort structure if gr if not Assigned(FDataGridSelect) then - FDataGridSelect := TWideStringlist.Create; + FDataGridSelect := TStringList.Create; if not RefreshingData then begin FDataGridSelect.Clear; SynMemoFilter.Clear; SetLength(FDataGridSort, 0); end else begin // Save current attributes if grid gets refreshed - HiddenCols := TWideStringlist.Create; + HiddenCols := TStringList.Create; HiddenCols.Delimiter := REGDELIM; HiddenCols.StrictDelimiter := True; if FDataGridSelect.Count > 0 then for i:=0 to SelectedTableColumns.Count-1 do begin @@ -7397,7 +7397,7 @@ begin // Columns if MainReg.ValueExists(REGNAME_HIDDENCOLUMNS) then begin - HiddenCols := TWideStringlist.Create; + HiddenCols := TStringList.Create; HiddenCols.Delimiter := REGDELIM; HiddenCols.StrictDelimiter := True; HiddenCols.DelimitedText := MainReg.ReadString(REGNAME_HIDDENCOLUMNS); @@ -7488,7 +7488,7 @@ var i : Integer; vt: TVirtualStringTree; Results: TMySQLQuery; - Sel: TWideStringList; + Sel: TStringList; begin // Display server variables vt := Sender as TVirtualStringTree; @@ -7502,7 +7502,7 @@ begin SetLength(VTRowDataListVariables, Results.RecordCount); for i:=0 to Results.RecordCount-1 do begin VTRowDataListVariables[i].ImageIndex := 25; - VTRowDataListVariables[i].Captions := TWideStringList.Create; + VTRowDataListVariables[i].Captions := TStringList.Create; VTRowDataListVariables[i].Captions.Add(Results.Col(0)); VTRowDataListVariables[i].Captions.Add(Results.Col(1)); Results.Next; @@ -7532,7 +7532,7 @@ var val, avg_perhour, avg_persec: String; valIsBytes, valIsNumber: Boolean; vt: TVirtualStringTree; - Sel: TWideStringList; + Sel: TStringList; begin // Display server status key/value pairs vt := Sender as TVirtualStringTree; @@ -7546,7 +7546,7 @@ begin SetLength(VTRowDataListStatus, Results.RecordCount); for i:=0 to Results.RecordCount-1 do begin VTRowDataListStatus[i].ImageIndex := 25; - VTRowDataListStatus[i].Captions := TWideStringList.Create; + VTRowDataListStatus[i].Captions := TStringList.Create; VTRowDataListStatus[i].Captions.Add(Results.Col(0)); val := Results.Col(1); avg_perhour := ''; @@ -7601,7 +7601,7 @@ var i, j: Integer; Results: TMySQLQuery; vt: TVirtualStringTree; - Sel: TWideStringList; + Sel: TStringList; Text: String; const InfoLen = SIZE_KB*10; @@ -7633,7 +7633,7 @@ begin else VTRowDataListProcesses[i].ImageIndex := 57 // running query end; - VTRowDataListProcesses[i].Captions := TWideStringList.Create; + VTRowDataListProcesses[i].Captions := TStringList.Create; for j:=0 to Results.ColumnCount-1 do begin Text := Results.Col(j); if Results.ColumnNames[j] = 'Info' then @@ -7667,7 +7667,7 @@ procedure TMainForm.ListCommandStatsBeforePaint(Sender: TBaseVirtualTree; Target tmpval : Double; begin VTRowDataListCommandStats[idx].ImageIndex := 25; - VTRowDataListCommandStats[idx].Captions := TWideStringList.Create; + VTRowDataListCommandStats[idx].Captions := TStringList.Create; caption := Copy( caption, 5, Length(caption) ); caption := WideStringReplace( caption, '_', ' ', [rfReplaceAll] ); VTRowDataListCommandStats[idx].Captions.Add( caption ); @@ -7693,7 +7693,7 @@ var questions: Int64; Results: TMySQLQuery; vt: TVirtualStringTree; - Sel: TWideStringList; + Sel: TStringList; begin // Display command statistics vt := Sender as TVirtualStringTree; @@ -8635,7 +8635,7 @@ end; procedure TMainForm.comboOnlyDBsDragDrop(Sender, Source: TObject; X, Y: Integer); var - dbs: TWideStringList; + dbs: TStringList; newdb: String; begin // DBtree node dropped on DB filter dropdown @@ -8865,13 +8865,13 @@ var MenuItem: TMenuItem; sql, Val, WhereClause: String; i, idx: Integer; - ColumnNames, DefaultValues, KeyColumns: TWideStringlist; + ColumnNames, DefaultValues, KeyColumns: TStringList; Column: TTableColumn; begin // Generate INSERT, UPDATE or DELETE query using selected columns MenuItem := (Sender as TMenuItem); - ColumnNames := TWideStringlist.Create; - DefaultValues := TWideStringlist.Create; + ColumnNames := TStringList.Create; + DefaultValues := TStringList.Create; for i:=0 to ActiveQueryHelpers.Items.Count-1 do begin if ActiveQueryHelpers.Selected[i] then begin ColumnNames.Add(mask(ActiveQueryHelpers.Items[i])); diff --git a/source/mysql_connection.pas b/source/mysql_connection.pas index 2cdf4fd2..89a17cc9 100644 --- a/source/mysql_connection.pas +++ b/source/mysql_connection.pas @@ -100,8 +100,8 @@ type FTableEngineDefault: String; FCollationTable: TMySQLQuery; FCharsetTable: TMySQLQuery; - FInformationSchemaObjects: TWideStringlist; - FDBObjectLists: TWideStringList; + FInformationSchemaObjects: TStringList; + FDBObjectLists: TStringList; procedure SetActive(Value: Boolean); procedure SetDatabase(Value: String); function GetThreadId: Cardinal; @@ -115,7 +115,7 @@ type function GetCollationList: TStringList; function GetCharsetTable: TMySQLQuery; function GetCharsetList: TStringList; - function GetInformationSchemaObjects: TWideStringlist; + function GetInformationSchemaObjects: TStringList; function GetConnectionUptime: Integer; function GetServerUptime: Integer; procedure Log(Category: TMySQLLogCategory; Msg: String); @@ -131,7 +131,7 @@ type function DeQuoteIdent(Identifier: String): String; function ConvertServerVersion(Version: Integer): String; function GetResults(SQL: String): TMySQLQuery; - function GetCol(SQL: String; Column: Integer=0): TWideStringList; + function GetCol(SQL: String; Column: Integer=0): TStringList; function GetVar(SQL: String; Column: Integer=0): String; overload; function GetVar(SQL: String; Column: String): String; overload; function Ping: Boolean; @@ -158,7 +158,7 @@ type property CollationList: TStringList read GetCollationList; property CharsetTable: TMySQLQuery read GetCharsetTable; property CharsetList: TStringList read GetCharsetList; - property InformationSchemaObjects: TWideStringlist read GetInformationSchemaObjects; + property InformationSchemaObjects: TStringList read GetInformationSchemaObjects; published property Active: Boolean read FActive write SetActive default False; property Hostname: String read FHostname write FHostname; @@ -183,7 +183,7 @@ type FConnection: TMySQLConnection; FRecNo, FRecordCount: Int64; - FColumnNames: TWideStringList; + FColumnNames: TStringList; FLastResult: PMYSQL_RES; FCurrentRow: PMYSQL_ROW; FEof: Boolean; @@ -209,7 +209,7 @@ type property RecNo: Int64 read FRecNo write SetRecNo; property Eof: Boolean read FEof; property RecordCount: Int64 read FRecordCount; - property ColumnNames: TWideStringList read FColumnNames; + property ColumnNames: TStringList read FColumnNames; published property SQL: String read FSQL write SetSQL; property Connection: TMySQLConnection read FConnection write FConnection; @@ -713,12 +713,12 @@ begin end; -function TMySQLConnection.GetCol(SQL: String; Column: Integer=0): TWideStringList; +function TMySQLConnection.GetCol(SQL: String; Column: Integer=0): TStringList; var Results: TMySQLQuery; begin Results := GetResults(SQL); - Result := TWideStringList.Create; + Result := TStringList.Create; if Results.RecordCount > 0 then while not Results.Eof do begin Result.Add(Results.Col(Column)); Results.Next; @@ -857,13 +857,13 @@ begin end; -function TMySQLConnection.GetInformationSchemaObjects: TWideStringList; +function TMySQLConnection.GetInformationSchemaObjects: TStringList; begin if not Assigned(FInformationSchemaObjects) then try FInformationSchemaObjects := GetCol('SHOW TABLES FROM '+QuoteIdent('information_schema')); except // Gracefully return an empty list on old servers - FInformationSchemaObjects := TWideStringlist.Create; + FInformationSchemaObjects := TStringList.Create; end; Result := FInformationSchemaObjects; end; @@ -1126,7 +1126,7 @@ begin // Add list of objects in this database to cached list of all databases if not Assigned(FDBObjectLists) then - FDBObjectLists := TWideStringList.Create; + FDBObjectLists := TStringList.Create; FDBObjectLists.AddObject(db, Result); end; end; @@ -1140,7 +1140,7 @@ begin inherited Create(AOwner); FRecNo := -1; FRecordCount := 0; - FColumnNames := TWideStringlist.Create; + FColumnNames := TStringList.Create; FColumnNames.CaseSensitive := True; end; diff --git a/source/mysql_structures.pas b/source/mysql_structures.pas index 367a65cc..757bb3f5 100644 --- a/source/mysql_structures.pas +++ b/source/mysql_structures.pas @@ -60,7 +60,7 @@ type var MySQLKeywords: TStringList; - MySQLErrorCodes: TWideStringList; + MySQLErrorCodes: TStringList; // MySQL data type categories DatatypeCategories: array[0..8] of TDatatypeCategory = ( diff --git a/source/routine_editor.pas b/source/routine_editor.pas index 6179947d..2bc519cd 100644 --- a/source/routine_editor.pas +++ b/source/routine_editor.pas @@ -67,7 +67,7 @@ type procedure btnDiscardClick(Sender: TObject); private { Private declarations } - Parameters: TWideStringList; + Parameters: TStringList; FAlterRoutineType: String; public { Public declarations } @@ -106,7 +106,7 @@ begin comboReturns.Items.Add(Datatypes[i].Name); Mainform.SynCompletionProposal.AddEditor(SynMemoBody); FixVT(listParameters); - Parameters := TWideStringList.Create; + Parameters := TStringList.Create; editName.MaxLength := NAME_LEN; end; @@ -284,7 +284,7 @@ procedure TfrmRoutineEditor.listParametersGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); var - Values: TWideStringList; + Values: TStringList; begin if Column = 0 then CellText := IntToStr(Node.Index+1) @@ -319,7 +319,7 @@ end; procedure TfrmRoutineEditor.listParametersNewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; NewText: String); var - OldValues: TWideStringList; + OldValues: TStringList; new: String; begin OldValues := explode(DELIM, Parameters[Node.Index]); @@ -346,13 +346,13 @@ begin else if Column = 2 then begin EnumEditor := TEnumEditorLink.Create(VT); EnumEditor.AllowCustomText := True; - EnumEditor.ValueList := TWideStringList.Create; + EnumEditor.ValueList := TStringList.Create; for i:=Low(Datatypes) to High(Datatypes) do EnumEditor.ValueList.Add(Datatypes[i].Name); EditLink := EnumEditor; end else if Column = 3 then begin EnumEditor := TEnumEditorLink.Create(VT); - EnumEditor.ValueList := TWideStringList.Create; + EnumEditor.ValueList := TStringList.Create; EnumEditor.ValueList.Add('IN'); EnumEditor.ValueList.Add('OUT'); EnumEditor.ValueList.Add('INOUT'); @@ -409,7 +409,7 @@ procedure TfrmRoutineEditor.ApplyModifications; var BaseSQL, TempSQL, FinalSQL, TempName: String; i: Integer; - par, allRoutineNames: TWideStringList; + par, allRoutineNames: TStringList; ProcOrFunc: String; TargetExists: Boolean; begin diff --git a/source/runsqlfile.pas b/source/runsqlfile.pas index d0fe0cbe..93954620 100644 --- a/source/runsqlfile.pas +++ b/source/runsqlfile.pas @@ -71,7 +71,7 @@ var querycount, rowsaffected : Int64; starttime : Cardinal; - SQL : TWideStringList; + SQL : TStringList; i : Integer; lines_remaining : String; begin diff --git a/source/selectdbobject.pas b/source/selectdbobject.pas index c88d943f..51f24a15 100644 --- a/source/selectdbobject.pas +++ b/source/selectdbobject.pas @@ -39,14 +39,14 @@ type PVirtualNode; var InitialStates: TVirtualNodeInitStates); private { Private declarations } - FColumns: Array of Array of TWideStringList; - function GetSelectedObject: TWideStringList; + FColumns: Array of Array of TStringList; + function GetSelectedObject: TStringList; public { Public declarations } - property SelectedObject: TWideStringList read GetSelectedObject; + property SelectedObject: TStringList read GetSelectedObject; end; -function SelectDBO: TWideStringList; +function SelectDBO: TStringList; implementation @@ -54,7 +54,7 @@ uses main, helpers; {$R *.dfm} -function SelectDBO: TWideStringList; +function SelectDBO: TStringList; begin if Mainform.SelectDBObjectForm = nil then Mainform.SelectDBObjectForm := TfrmSelectDBObject.Create(Mainform); @@ -115,11 +115,11 @@ begin end; -function TfrmSelectDBObject.GetSelectedObject: TWideStringList; +function TfrmSelectDBObject.GetSelectedObject: TStringList; begin Result := nil; if editDb.Text <> '' then begin - Result := TWideStringList.Create; + Result := TStringList.Create; Result.Add(editDb.Text); if editTable.Text <> '' then Result.Add(editTable.Text); if editCol.Text <> '' then Result.Add(editCol.Text); @@ -179,7 +179,7 @@ procedure TfrmSelectDBObject.TreeDBOInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); var DBObjects: TDBObjectList; - cols: TWideStringList; + cols: TStringList; begin // Fetch sub nodes Mainform.DBtreeInitChildren(Sender, Node, ChildCount); diff --git a/source/table_editor.pas b/source/table_editor.pas index 45f57fef..f79483ba 100644 --- a/source/table_editor.pas +++ b/source/table_editor.pas @@ -178,7 +178,7 @@ type FColumns: TTableColumnList; FKeys: TTableKeyList; FForeignKeys: TForeignKeyList; - DeletedKeys, DeletedForeignKeys: TWideStringList; + DeletedKeys, DeletedForeignKeys: TStringList; procedure ValidateColumnControls; procedure ValidateIndexControls; procedure MoveFocusedIndexPart(NewIdx: Cardinal); @@ -231,8 +231,8 @@ begin FColumns := TTableColumnList.Create; FKeys := TTableKeyList.Create; FForeignKeys := TForeignKeyList.Create; - DeletedKeys := TWideStringList.Create; - DeletedForeignKeys := TWideStringList.Create; + DeletedKeys := TStringList.Create; + DeletedForeignKeys := TStringList.Create; editName.MaxLength := NAME_LEN; end; @@ -359,10 +359,10 @@ procedure TfrmTableEditor.ApplyModifications; var sql: String; i: Integer; - Specs: TWideStringlist; + Specs: TStringList; begin // Create or alter table - Specs := TWideStringList.Create; + Specs := TStringList.Create; if FEditObjectName = '' then sql := ComposeCreateStatement else begin @@ -441,7 +441,7 @@ end; function TfrmTableEditor.ComposeAlterStatement: String; var - Specs: TWideStringlist; + Specs: TStringList; ColSpec, OldColName, IndexSQL: String; i: Integer; Results: TMySQLQuery; @@ -451,7 +451,7 @@ begin // Compose ALTER query, called by buttons and for SQL code tab Mainform.showstatus('Composing ALTER statement ...'); Screen.Cursor := crHourglass; - Specs := TWideStringlist.Create; + Specs := TStringList.Create; if editName.Text <> FEditObjectName then Specs.Add('RENAME TO ' + Mainform.mask(editName.Text)); if memoComment.Tag = ModifiedFlag then @@ -1190,7 +1190,7 @@ begin end; 8: begin // Collation pulldown EnumEditor := TEnumEditorLink.Create(VT); - EnumEditor.ValueList := TWideStringList.Create; + EnumEditor.ValueList := TStringList.Create; EnumEditor.ValueList.Text := Mainform.Connection.CollationList.Text; EnumEditor.ValueList.Insert(0, ''); EditLink := EnumEditor; @@ -1502,7 +1502,7 @@ begin if (Level = 0) and (Column = 1) then begin // Index type pulldown EnumEditor := TEnumEditorLink.Create(VT); - EnumEditor.ValueList := TWideStringList.Create; + EnumEditor.ValueList := TStringList.Create; EnumEditor.ValueList.CommaText := PKEY +','+ KEY +','+ UKEY +','+ FKEY +','+ SKEY; EditLink := EnumEditor; end else if (Level = 1) and (Column = 0) then begin @@ -1786,7 +1786,7 @@ var Item: TMenuItem; i: Integer; NewType: String; - NewParts: TWideStringlist; + NewParts: TStringList; TblKey: TTableKey; begin // Auto create index or add columns to existing one by rightclicking a column diff --git a/source/tabletools.pas b/source/tabletools.pas index 1e844024..88c58e78 100644 --- a/source/tabletools.pas +++ b/source/tabletools.pas @@ -108,12 +108,12 @@ type { Private declarations } FResults: TObjectList; FToolMode: TToolMode; - OutputFiles, OutputDirs: TWideStringList; + OutputFiles, OutputDirs: TStringList; ExportStream: TStream; ExportLastDatabase: String; FTargetConnection: TMySQLConnection; FLastOutputSelectedIndex: Integer; - FModifiedDbs: TWideStringList; + FModifiedDbs: TStringList; procedure SetToolMode(Value: TToolMode); procedure AddResults(SQL: String); procedure AddNotes(Col1, Col2, Col3, Col4: String); @@ -125,7 +125,7 @@ type procedure DoBulkTableEdit(DBObj: TDBObject); public { Public declarations } - SelectedTables: TWideStringList; + SelectedTables: TStringList; property ToolMode: TToolMode read FToolMode write SetToolMode; end; @@ -177,8 +177,8 @@ begin chkExportTablesDrop.Checked := GetRegValue(REGNAME_EXP_DROPTABLE, chkExportTablesDrop.Checked); comboExportData.Items.Text := DATA_NO+CRLF +DATA_REPLACE+CRLF +DATA_INSERT+CRLF +DATA_INSERTNEW+CRLF +DATA_UPDATE; comboExportData.ItemIndex := GetRegValue(REGNAME_EXP_DATAHOW, 0); - OutputFiles := TWideStringList.Create; - OutputDirs := TWideStringList.Create; + OutputFiles := TStringList.Create; + OutputDirs := TStringList.Create; OutputFiles.Text := GetRegValue(REGNAME_EXP_OUTFILES, ''); OutputDirs.Text := GetRegValue(REGNAME_EXP_OUTDIRS, ''); comboExportOutputType.Items.Text := OUTPUT_FILE+CRLF +OUTPUT_DIR+CRLF +OUTPUT_DB; @@ -199,8 +199,8 @@ begin FixVT(TreeObjects); FixVT(ResultGrid); FResults := TObjectList.Create; - SelectedTables := TWideStringList.Create; - FModifiedDbs := TWideStringList.Create; + SelectedTables := TStringList.Create; + FModifiedDbs := TStringList.Create; FModifiedDbs.Duplicates := dupIgnore; end; @@ -560,7 +560,7 @@ end; procedure TfrmTableTools.AddResults(SQL: String); var i: Integer; - Row: TWideStringlist; + Row: TStringList; Results: TMySQLQuery; begin // Execute query and append results into grid @@ -571,7 +571,7 @@ begin SetupResultGrid(Results); Results.First; while not Results.Eof do begin - Row := TWideStringlist.Create; + Row := TStringList.Create; for i:=0 to Results.ColumnCount-1 do begin if Results.DataType(i).Category = dtcInteger then Row.Add(FormatNumber(Results.Col(i))) @@ -589,11 +589,11 @@ end; procedure TfrmTableTools.AddNotes(Col1, Col2, Col3, Col4: String); var - Row: TWideStringlist; + Row: TStringList; begin // Adds a row with non SQL results SetupResultGrid; - Row := TWideStringlist.Create; + Row := TStringList.Create; Row.Add(Col1); Row.Add(Col2); Row.Add(Col3); @@ -656,18 +656,18 @@ end; procedure TfrmTableTools.ResultGridGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); begin - NodeDataSize := SizeOf(TWideStringList); + NodeDataSize := SizeOf(TStringList); end; procedure TfrmTableTools.ResultGridInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); var - Data: ^TWideStringList; + Data: ^TStringList; begin // Bind string list to node Data := Sender.GetNodeData(Node); - Data^ := FResults[Node.Index] as TWideStringList; + Data^ := FResults[Node.Index] as TStringList; end; @@ -693,7 +693,7 @@ end; procedure TfrmTableTools.ResultGridGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); var - Data: ^TWideStringList; + Data: ^TStringList; begin if Column > NoColumn then begin Data := Sender.GetNodeData(Node); @@ -718,7 +718,7 @@ var NewIdx, NetType: Integer; DBNode: PVirtualNode; SessionName: String; - Databases: TWideStringlist; + Databases: TStringList; begin // Target type (file, directory, ...) selected OldItem := comboExportOutputTarget.Text; @@ -805,7 +805,7 @@ end; procedure TfrmTableTools.comboExportOutputTargetExit(Sender: TObject); var - ItemList: TWideStringList; + ItemList: TStringList; idx: Integer; begin // Add typed text to recent items @@ -895,7 +895,7 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject); var ToFile, ToDir, ToDb, ToServer, IsLastRowInChunk, NeedsDBStructure: Boolean; Struc, Header, FinalDbName, BaseInsert, Row, TargetDbAndObject: String; - LogRow, MultiSQL: TWideStringlist; + LogRow, MultiSQL: TStringList; i: Integer; RowCount, MaxRowsInChunk, RowsInChunk, Limit, Offset, ResultCount: Int64; StartTime: Cardinal; @@ -1132,7 +1132,7 @@ begin break; end; Output('', True, True, True, True, True); - LogRow := TWideStringList(FResults.Last); + LogRow := TStringList(FResults.Last); LogRow[2] := FormatNumber(RowCount) + ' / ' + FormatNumber(100/Max(DBObj.Rows,1)*RowCount, 0)+'%'; LogRow[3] := FormatTimeNumber((GetTickCount-StartTime) DIV 1000); UpdateResultGrid; @@ -1173,7 +1173,7 @@ end; procedure TfrmTableTools.DoBulkTableEdit(DBObj: TDBObject); var - Specs, LogRow: TWideStringList; + Specs, LogRow: TStringList; CreateView: String; rx: TRegExpr; begin @@ -1182,7 +1182,7 @@ begin esc('Updating...')+' AS '+Mainform.mask('Operation')+', '+ ''''' AS '+Mainform.mask('Result') ); - Specs := TWideStringlist.Create; + Specs := TStringList.Create; if chkBulkTableEditDatabase.Checked and (comboBulkTableEditDatabase.Text <> DBObj.Database) then begin case DBObj.NodeType of lntTable: Specs.Add('RENAME ' + Mainform.mask(comboBulkTableEditDatabase.Text)+'.'+Mainform.mask(DBObj.Name)); @@ -1221,7 +1221,7 @@ begin if (DBObj.NodeType = lntTable) and chkBulkTableEditResetAutoinc.Checked then Specs.Add('AUTO_INCREMENT=0'); - LogRow := TWideStringList(FResults.Last); + LogRow := TStringList(FResults.Last); if Specs.Count > 0 then begin Mainform.Connection.Query('ALTER TABLE ' + Mainform.mask(DBObj.Database) + '.' + Mainform.mask(DBObj.Name) + ' ' + ImplodeStr(', ', Specs)); LogRow[2] := 'Done'; diff --git a/source/usermanager.pas b/source/usermanager.pas index 6e96a418..cff5fd2d 100644 --- a/source/usermanager.pas +++ b/source/usermanager.pas @@ -21,17 +21,17 @@ type FModified: Boolean; function GetDBOKey: String; function GetDBOPrettyKey: String; - function GetPrettyPrivNames: TWideStringList; + function GetPrettyPrivNames: TStringList; public - DBONames: TWideStringList; - PrivNames: TWideStringList; - SelectedPrivNames: TWideStringList; + DBONames: TStringList; + PrivNames: TStringList; + SelectedPrivNames: TStringList; constructor Create(Fields: TMySQLQuery; FieldDefs: TMySQLQuery=nil; AvoidFieldDefs: TMySQLQuery=nil; CropFieldDefs: TMySQLQuery=nil; SimulateDbField: Boolean = False); procedure Merge(Fields: TMySQLQuery); property DBOType: TListNodeType read FDBOType; property DBOKey: String read GetDBOKey; property DBOPrettyKey: String read GetDBOPrettyKey; - property PrettyPrivNames: TWideStringList read GetPrettyPrivNames; + property PrettyPrivNames: TStringList read GetPrettyPrivNames; property Added: Boolean read FAdded write FAdded; property Modified: Boolean read FModified write FModified; property Deleted: Boolean read FDeleted write FDeleted; @@ -202,7 +202,7 @@ type { Public declarations } end; -procedure GetPrivilegeRowKey(Fields: TMySQLQuery; SimulateDbField: Boolean; out DBOType: TListNodeType; out DBONames: TWideStringList); +procedure GetPrivilegeRowKey(Fields: TMySQLQuery; SimulateDbField: Boolean; out DBOType: TListNodeType; out DBONames: TStringList); implementation @@ -609,7 +609,7 @@ end; procedure TUserManagerForm.btnAddObjectClick(Sender: TObject); var - NewObj: TWideStringList; + NewObj: TStringList; ds, FieldDefs: TMySQLQuery; NewPriv: TPrivilege; u: TUser; @@ -890,7 +890,7 @@ var sql, TableName, SetFieldName: String; TableSet: TMySQLQuery; AcctWhere, AcctValues, PrivWhere: String; - AcctUpdates, PrivValues, PrivUpdates: TWideStringList; + AcctUpdates, PrivValues, PrivUpdates: TStringList; procedure LogSQL(sql: String); begin Mainform.LogSQL(sql); @@ -899,7 +899,7 @@ var begin Result := Mainform.Mask(sql); end; - function Delim(list: TWideStringList; spacing: Boolean = True): String; + function Delim(list: TStringList; spacing: Boolean = True): String; var i: Integer; begin @@ -947,7 +947,7 @@ begin end; end; - AcctUpdates := TWideStringList.Create; + AcctUpdates := TStringList.Create; AcctUpdates.Delimiter := ','; LogSQL('Propagating key changes for renamed and redesignated accounts...'); for i := 0 to Users.Count - 1 do begin @@ -1075,9 +1075,9 @@ begin end; LogSQL('Applying privilege changes...'); - PrivUpdates := TWideStringList.Create; + PrivUpdates := TStringList.Create; PrivUpdates.Delimiter := ','; - PrivValues := TWideStringList.Create; + PrivValues := TStringList.Create; PrivValues.Delimiter := ','; for i := 0 to Users.Count - 1 do begin u := Users[i]; @@ -1541,7 +1541,7 @@ function TPrivileges.FindPrivilege(Fields: TMySQLQuery; SimulateDbField: Boolean var i : Integer; DBOType: TListNodeType; - DBONames: TWideStringList; + DBONames: TStringList; begin Result := nil; GetPrivilegeRowKey(Fields, SimulateDbField, DBOType, DBONames); @@ -1592,10 +1592,10 @@ var i: Integer; tables_col_ignore: Boolean; // Find possible values for the given SET column - function GetSETValues(FieldName: String): TWideStringList; + function GetSETValues(FieldName: String): TStringList; begin FieldDefs.First; - Result := TWideStringList.Create; + Result := TStringList.Create; while not FieldDefs.Eof do begin if FieldDefs.Col('Field') = FieldName + '_priv' then begin Result.QuoteChar := ''''; @@ -1609,9 +1609,9 @@ begin FDeleted := False; FAdded := False; FModified := False; - DBONames := TWideStringList.Create; - PrivNames := TWideStringList.Create; - SelectedPrivNames := TWideStringList.Create; + DBONames := TStringList.Create; + PrivNames := TStringList.Create; + SelectedPrivNames := TStringList.Create; // Find out what xxxx_priv privilege columns this server/version has. PrivNames.Text := Fields.ColumnNames.Text; for i := PrivNames.Count - 1 downto 0 do begin @@ -1708,12 +1708,12 @@ begin Result := DBONames.DelimitedText; end; -function TPrivilege.GetPrettyPrivNames: TWideStringList; +function TPrivilege.GetPrettyPrivNames: TStringList; var i: Integer; p: String; begin - Result := TWideStringList.Create; + Result := TStringList.Create; for i := 0 to PrivNames.Count - 1 do begin // Fetch original name p := PrivNames[i]; @@ -1724,12 +1724,12 @@ begin end; -procedure GetPrivilegeRowKey(Fields: TMySQLQuery; SimulateDbField: Boolean; out DBOType: TListNodeType; out DBONames: TWideStringList); +procedure GetPrivilegeRowKey(Fields: TMySQLQuery; SimulateDbField: Boolean; out DBOType: TListNodeType; out DBONames: TStringList); var RowsExist: Boolean; begin DBOType := lntNone; - DBONames := TWideStringList.Create; + DBONames := TStringList.Create; DBONames.Delimiter := '.'; if SimulateDbField then begin DBOType := lntDb;