opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support additional UCA collations introduced in MariaDB 10.10.1. Closes #1917

Browse Source
This commit is contained in:
Ansgar Becker
2024-03-03 19:24:18 +01:00
parent b7e7207cb0
commit 7ef74ddc63
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/dbconnection.pas
View File

@@ -2075,6 +2075,7 @@ begin
FMaxRowsPerInsert := 10000; FMaxRowsPerInsert := 10000;
FCaseSensitivity := 0; FCaseSensitivity := 0;
FStringQuoteChar := ''''; FStringQuoteChar := '''';
FCollationTable := nil;
end; end;
@@ -5328,8 +5329,19 @@ end;
function TMySQLConnection.GetCollationTable: TDBQuery; function TMySQLConnection.GetCollationTable: TDBQuery;
begin begin
inherited; inherited;
if (not Assigned(FCollationTable)) and (ServerVersionInt >= 40100) then if (not Assigned(FCollationTable)) and (ServerVersionInt >= 40100) then begin
FCollationTable := GetResults('SHOW COLLATION'); if Parameters.IsMariaDB and (ServerVersionInt >= 101001) then try
// Issue #1917: MariaDB 10.10.1+ versions have additional collations in IS.COLLATION_CHARACTER_SET_APPLICABILITY
FCollationTable := GetResults('SELECT FULL_COLLATION_NAME AS '+QuoteIdent('Collation')+
' FROM '+QuoteIdent(InfSch)+'.COLLATION_CHARACTER_SET_APPLICABILITY'+
' ORDER BY '+QuoteIdent('Collation')
);
except
on E:EDbError do;
end;
if not Assigned(FCollationTable) then
FCollationTable := GetResults('SHOW COLLATION');
end;
if Assigned(FCollationTable) then if Assigned(FCollationTable) then
FCollationTable.First; FCollationTable.First;
Result := FCollationTable; Result := FCollationTable;