Skip to content

Commit

Permalink
some Zeos/ZDBC fixes
Browse files Browse the repository at this point in the history
- backport from mORMot 2
  • Loading branch information
Arnaud Bouchez committed Mar 1, 2021
1 parent dcb1a71 commit 7f16895
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion SynDBZeos.pas
Expand Up @@ -158,6 +158,9 @@ interface
{$if defined(ENABLE_INTERBASE) and not defined(ZEOS_DISABLE_INTERBASE)}
ZDbcInterbase6,
{$ifend}
{$if defined(ENABLE_FIREBIRD) and not defined(ZEOS_DISABLE_FIREBIRD)}
ZDbcFirebird,
{$ifend}
{$if defined(ENABLE_SQLITE) and not defined(ZEOS_DISABLE_SQLITE)}
ZDbcSqLite,
{$ifend}
Expand All @@ -176,10 +179,13 @@ interface
{$if defined(ENABLE_ODBC) and not defined(ZEOS_DISABLE_ODBC)}
ZDbcODBCCon,
{$ifend}

// main ZDBC units
ZCompatibility,
ZVariant,
{$ifndef ZEOS80UP}
ZURL,
{$endif ZEOS80UP}
ZDbcIntfs,
ZDbcResultSet,
// mORMot units after ZDBC due to some name conflicts (e.g. UTF8ToString)
Expand Down Expand Up @@ -728,7 +734,8 @@ procedure TSQLDBZEOSConnectionProperties.GetFields(
sSchema := UTF8ToString(Schema);
{ mormot does not create the Tables casesensitive but gives mixed cased strings as tablename
so we normalize the identifiers to database defaults : }
sTableName := meta.GetIdentifierConvertor.ExtractQuote(UTF8ToString(TableName));
sTableName := meta.{$ifdef ZEOS80UP}GetIdentifierConverter{$else}GetIdentifierConvertor{$endif}.
ExtractQuote(Utf8ToString(TableName));
sTableName := meta.AddEscapeCharToWildcards(sTableName); //do not use "like" search patterns ['_','%'] so they need to be escaped
res := meta.GetColumns('',sSchema,sTableName,'');
FA.InitSpecific(TypeInfo(TSQLDBColumnDefineDynArray),Fields,djRawUTF8,@n,true);
Expand Down
2 changes: 1 addition & 1 deletion SynopseCommit.inc
@@ -1 +1 @@
'1.18.6244'
'1.18.6245'

0 comments on commit 7f16895

Please sign in to comment.