paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-19 01:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Implemented GetTableNames, systemtables=true, bug #13893, by Ladislav Karrach

Browse Source 
git-svn-id: trunk@15498 -
This commit is contained in:
joost 2010-06-30 18:17:27 +00:00
parent 35bacb55b5
commit c58e26e25a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-db/src/sqldb/odbc/odbcconn.pas
View File

@ -646,6 +646,9 @@ begin
end; end;
procedure TODBCConnection.Execute(cursor: TSQLCursor; ATransaction: TSQLTransaction; AParams: TParams); procedure TODBCConnection.Execute(cursor: TSQLCursor; ATransaction: TSQLTransaction; AParams: TParams);
const
TABLE_TYPE_USER='TABLE,VIEW,GLOBAL TEMPORARY,LOCAL TEMPORARY'; //no spaces before/after comma
TABLE_TYPE_SYSTEM='SYSTEM TABLE';
var var
ODBCCursor:TODBCCursor; ODBCCursor:TODBCCursor;
Res:SQLRETURN; Res:SQLRETURN;
@ -658,7 +661,8 @@ begin
// execute the statement // execute the statement
case ODBCCursor.FSchemaType of case ODBCCursor.FSchemaType of
stNoSchema : Res:=SQLExecute(ODBCCursor.FSTMTHandle); //SQL_NO_DATA returns searched update or delete statement that does not affect any rows stNoSchema : Res:=SQLExecute(ODBCCursor.FSTMTHandle); //SQL_NO_DATA returns searched update or delete statement that does not affect any rows
stTables : Res:=SQLTables (ODBCCursor.FSTMTHandle, nil, 0, nil, 0, nil, 0, nil, 0 ); stTables : Res:=SQLTables (ODBCCursor.FSTMTHandle, nil, 0, nil, 0, nil, 0, TABLE_TYPE_USER, length(TABLE_TYPE_USER) );
stSysTables : Res:=SQLTables (ODBCCursor.FSTMTHandle, nil, 0, nil, 0, nil, 0, TABLE_TYPE_SYSTEM, length(TABLE_TYPE_SYSTEM) );
stColumns : Res:=SQLColumns(ODBCCursor.FSTMTHandle, nil, 0, nil, 0, @ODBCCursor.FQuery[1], length(ODBCCursor.FQuery), nil, 0 ); stColumns : Res:=SQLColumns(ODBCCursor.FSTMTHandle, nil, 0, nil, 0, @ODBCCursor.FQuery[1], length(ODBCCursor.FQuery), nil, 0 );
stProcedures: Res:=SQLProcedures(ODBCCursor.FSTMTHandle, nil, 0, nil, 0, nil, 0 ); stProcedures: Res:=SQLProcedures(ODBCCursor.FSTMTHandle, nil, 0, nil, 0, nil, 0 );
else Res:=SQL_NO_DATA; else Res:=SQL_NO_DATA;
@ -1302,7 +1306,7 @@ begin
Result := SchemaObjectName Result := SchemaObjectName
else else
Result := ' '; Result := ' ';
if not (SchemaType in [stNoSchema, stTables, stColumns, stProcedures]) then if not (SchemaType in [stNoSchema, stTables, stSysTables, stColumns, stProcedures]) then
DatabaseError(SMetadataUnavailable); DatabaseError(SMetadataUnavailable);
end; end;