--- ibx/trunk/runtime/nongui/IBTable.pas	2020/08/24 09:32:58	311
+++ ibx/trunk/runtime/nongui/IBTable.pas	2020/08/25 15:40:58	312
@@ -554,7 +554,7 @@ var
         ExtractIdentifier(Database.SQLDialect,
           QuoteIdentifier(DataBase.SQLDialect, Name)) +
         ''' ' +
-        'AND RDB$CONSTRAINT_TYPE = ''PRIMARY KEY''';
+        'AND Trim(RDB$CONSTRAINT_TYPE) = ''PRIMARY KEY''';
       Query.Prepare;
       Query.ExecQuery;
       if not Query.EOF then
@@ -748,7 +748,7 @@ begin
     Query.Database := DataBase;
     Query.Transaction := Database.InternalTransaction;
     Query.SQL.Text :=
-    'Select USER from RDB$RELATIONS where RDB$RELATION_NAME = ' + {do not localize}
+    'Select USER from RDB$RELATIONS where Trim(RDB$RELATION_NAME) = ' + {do not localize}
     '''' +
     ExtractIdentifier(Database.SQLDialect,
       QuoteIdentifier(DataBase.SQLDialect, FTableName)) + '''';
@@ -995,7 +995,7 @@ begin
     Query.Database := DataBase;
     Query.Transaction := Database.InternalTransaction;
     Query.SQL.Text := 'Select RDB$SYSTEM_FLAG, RDB$DBKEY_LENGTH ' + {do not localize}
-                    'from RDB$RELATIONS where RDB$RELATION_NAME = ' + {do not localize}
+                    'from RDB$RELATIONS where Trim(RDB$RELATION_NAME)  = ' + {do not localize}
                     '''' +
                     ExtractIdentifier(Database.SQLDialect,
                       QuoteIdentifier(DataBase.SQLDialect, FTableName)) + '''';