instantobjects-cvscommit

[Enrique E. <the...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30773/Brokers/ZeosDBO

Modified Files:
	InstantZeosDBOCatalog.pas 
Log Message:
Backward compatibility with Zeos 6.1.5 stable

Index: InstantZeosDBOCatalog.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantZeosDBOCatalog.pas	6 Nov 2005 20:51:53 -0000	1.2
--- InstantZeosDBOCatalog.pas	10 Nov 2005 19:35:30 -0000	1.3
***************
*** 160,174 ****
    TableMetadatas: TInstantTableMetadatas);
  var
-   TableType: TStringDynArray;
    TableMetadata: TInstantTableMetadata;
    Tables: IZResultSet;
  begin
-   SetLength(TableType, 1);
-   TableType[0] := 'TABLE';
    with Broker as TInstantZeosDBOBroker, Connector.Connection do
    begin
      if not Connector.Connected then Connector.Connect;
      DbcConnection.GetMetadata.ClearCache;
!     Tables := DbcConnection.GetMetadata.GetTables(Catalog, '', '', TableType);
    end;
  
--- 160,171 ----
    TableMetadatas: TInstantTableMetadatas);
  var
    TableMetadata: TInstantTableMetadata;
    Tables: IZResultSet;
  begin
    with Broker as TInstantZeosDBOBroker, Connector.Connection do
    begin
      if not Connector.Connected then Connector.Connect;
      DbcConnection.GetMetadata.ClearCache;
!     Tables := DbcConnection.GetMetadata.GetTables(Catalog, '', '', nil);
    end;
  
***************
*** 176,185 ****
    while Tables.Next do
    begin
!     TableMetadata := TableMetadatas.Add;
!     TableMetadata.Name := Tables.GetStringByName('TABLE_NAME');
!     // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
!     // indexes are defined to correctly set the foIndexed option.
!     AddIndexMetadatas(TableMetadata);
!     AddFieldMetadatas(TableMetadata);
    end;
  end;
--- 173,185 ----
    while Tables.Next do
    begin
!     if AnsiSameStr(Tables.GetStringByName('TABLE_TYPE'), 'TABLE') then
!     begin
!       TableMetadata := TableMetadatas.Add;
!       TableMetadata.Name := Tables.GetStringByName('TABLE_NAME');
!       // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
!       // indexes are defined to correctly set the foIndexed option.
!       AddIndexMetadatas(TableMetadata);
!       AddFieldMetadatas(TableMetadata);
!     end;
    end;
  end;