Skip to content

Commit

Permalink
upgrade MySQL driver
Browse files Browse the repository at this point in the history
  • Loading branch information
Grahame Grieve committed Jan 3, 2024
1 parent 99e641b commit cae1897
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion library/fdb/fdb_odbc.pas
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ function StandardODBCDriverName(APlatform: TFDBPlatform): String;
kdbInterbase: Result := 'Intersolv Interbase ODBC Driver (*.gdb)'; // not that we would actually ever use this
kdbDB2: Result := 'IBM DB2 ODBC DRIVER';
kdbOracle8: Result := 'Oracle ODBC Driver';
kdbMySQL : result := 'MySQL ODBC 8.0 Unicode Driver';
kdbMySQL : result := 'MySQL ODBC 8.2 Unicode Driver';
else
Result := 'Unknown Platform ' + inttostr(ord(APlatform));
end;
Expand Down
2 changes: 2 additions & 0 deletions server/kernel.pas
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,8 @@ procedure initLogging(params : TCommandLineParameters; cfg : TCustomIniFile);
begin
if cfg.valueExists('config', 'log') then
logFilename := cfg.readString('config', 'log', '')
else if params.has('-tests') then
logFilename := filePath(['[tmp]', 'fhirserver-tests.log'])
else
logFilename := filePath(['[tmp]', 'fhirserver.log']);
Logging.logToFile(logFilename);
Expand Down
6 changes: 3 additions & 3 deletions server/test_registry.pas
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ implementation
const
{$IFDEF WINDOWS}
DefaultMSSQLDriver = 'SQL Server';
DefaultMySQLDriver = 'MySQL ODBC 8.0 Unicode Driver';
DefaultMySQLDriver = 'MySQL ODBC 8.2 Unicode Driver';
{$ENDIF}
{$IFDEF LINUX}
DefaultMSSQLDriver = 'ODBC Driver 17 for SQL Server';
DefaultMySQLDriver = 'MySQL ODBC 8.0 Unicode Driver';
DefaultMySQLDriver = 'MySQL ODBC 8.2 Unicode Driver';
{$ENDIF}
{$IFDEF OSX}
DefaultMSSQLDriver = 'ODBC Driver 17 for SQL Server';
DefaultMySQLDriver = 'MySQL ODBC 8.0 Unicode Driver';
DefaultMySQLDriver = 'MySQL ODBC 8.2 Unicode Driver';
{$ENDIF}

Procedure SetUpDefaultTestSettings(filename : String);
Expand Down

0 comments on commit cae1897

Please sign in to comment.