Преглед на файлове

fcl-db: sqldb: align column naming (PROCEDURE_NAME) for stProcedures schema query with ODBC standard (SQLProcedures) and also with Delphi naming used in ADO OpenSchema for siProcedures (and partial also with DBX).
Damage is that SQL standard uses different naming (ROUTINE_NAME) in INFORMATION_SCHEMA.ROUTINES view :-(
Bug #26145

git-svn-id: trunk@27780 -

lacak преди 11 години
родител
ревизия
7de12fb703

+ 2 - 2
packages/fcl-db/src/sqldb/interbase/ibconnection.pp

@@ -1345,8 +1345,8 @@ begin
                            'rdb$procedure_id        as recno, '+
                            'rdb$procedure_id        as recno, '+
                           '''' + DatabaseName + ''' as catalog_name, '+
                           '''' + DatabaseName + ''' as catalog_name, '+
                           '''''                     as schema_name, '+
                           '''''                     as schema_name, '+
-                          'rdb$procedure_name       as proc_name, '+
-                          '0                        as proc_type, '+
+                          'rdb$procedure_name       as procedure_name, '+
+                          '0                        as procedure_type, '+
                           'rdb$procedure_inputs     as in_params, '+
                           'rdb$procedure_inputs     as in_params, '+
                           'rdb$procedure_outputs    as out_params '+
                           'rdb$procedure_outputs    as out_params '+
                         'from '+
                         'from '+

+ 1 - 1
packages/fcl-db/src/sqldb/mssql/mssqlconn.pp

@@ -964,7 +964,7 @@ begin
   case SchemaType of
   case SchemaType of
     stTables     : Result := format(SCHEMA_QUERY, ['TABLE_NAME, 1 as TABLE_TYPE', '''U''']);
     stTables     : Result := format(SCHEMA_QUERY, ['TABLE_NAME, 1 as TABLE_TYPE', '''U''']);
     stSysTables  : Result := format(SCHEMA_QUERY, ['TABLE_NAME, 4 as TABLE_TYPE', '''S''']);
     stSysTables  : Result := format(SCHEMA_QUERY, ['TABLE_NAME, 4 as TABLE_TYPE', '''S''']);
-    stProcedures : Result := format(SCHEMA_QUERY, ['PROC_NAME , case type when ''P'' then 1 else 2 end as PROC_TYPE', '''P'',''FN'',''IF'',''TF''']);
+    stProcedures : Result := format(SCHEMA_QUERY, ['PROCEDURE_NAME , case type when ''P'' then 1 else 2 end as PROCEDURE_TYPE', '''P'',''FN'',''IF'',''TF''']);
     stColumns    : Result := 'select colid as RECNO, db_name() as CATALOG_NAME, user_name(uid) as SCHEMA_NAME, o.name as TABLE_NAME,'+
     stColumns    : Result := 'select colid as RECNO, db_name() as CATALOG_NAME, user_name(uid) as SCHEMA_NAME, o.name as TABLE_NAME,'+
                                     'c.name   as COLUMN_NAME,'+
                                     'c.name   as COLUMN_NAME,'+
                                     'colid    as COLUMN_POSITION,'+
                                     'colid    as COLUMN_POSITION,'+

+ 1 - 1
packages/fcl-db/src/sqldb/oracle/oracleconnection.pp

@@ -1032,7 +1032,7 @@ begin
                         'WHERE Upper(TABLE_NAME) = '''+UpperCase(SchemaObjectName)+''' '+
                         'WHERE Upper(TABLE_NAME) = '''+UpperCase(SchemaObjectName)+''' '+
                         'ORDER BY COLUMN_NAME';
                         'ORDER BY COLUMN_NAME';
     stProcedures : s := 'SELECT '+
     stProcedures : s := 'SELECT '+
-                          'case when PROCEDURE_NAME is null then OBJECT_NAME ELSE OBJECT_NAME || ''.'' || PROCEDURE_NAME end AS proc_name '+
+                          'case when PROCEDURE_NAME is null then OBJECT_NAME ELSE OBJECT_NAME || ''.'' || PROCEDURE_NAME end AS procedure_name '+
                         'FROM USER_PROCEDURES ';
                         'FROM USER_PROCEDURES ';
   else
   else
     DatabaseError(SMetadataUnavailable)
     DatabaseError(SMetadataUnavailable)

+ 1 - 1
packages/fcl-db/src/sqldb/sqldb.pp

@@ -1206,7 +1206,7 @@ end;
 
 
 procedure TSQLConnection.GetProcedureNames(List: TStrings);
 procedure TSQLConnection.GetProcedureNames(List: TStrings);
 begin
 begin
-  GetDBInfo(stProcedures,'','proc_name',List);
+  GetDBInfo(stProcedures,'','procedure_name',List);
 end;
 end;
 
 
 procedure TSQLConnection.GetFieldNames(const TableName: string; List: TStrings);
 procedure TSQLConnection.GetFieldNames(const TableName: string; List: TStrings);