[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session ExtendedTableInfo.java,1.1,1.2 ExtendedColumnInfo.java,1.2,1.3 SchemaInfo.java,1.8,1.9

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9734

Modified Files:
	ExtendedTableInfo.java ExtendedColumnInfo.java SchemaInfo.java 
Log Message:
Added catalog and schema at serveral points

Index: ExtendedColumnInfo.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ExtendedColumnInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtendedColumnInfo.java	25 Aug 2004 08:22:26 -0000	1.2
--- ExtendedColumnInfo.java	17 Feb 2005 23:53:29 -0000	1.3
***************
*** 26,31 ****
     private int _decimalDigits;
     private boolean _nullable;
  
!    public ExtendedColumnInfo(String columnName, String columnType, int columnSize, int decimalDigits, boolean nullable)
     {
        _columnName = columnName;
--- 26,33 ----
     private int _decimalDigits;
     private boolean _nullable;
+    private String _cat;
+    private String _schem;
  
!    public ExtendedColumnInfo(String columnName, String columnType, int columnSize, int decimalDigits, boolean nullable, String cat, String schem)
     {
        _columnName = columnName;
***************
*** 34,37 ****
--- 36,41 ----
        _decimalDigits = decimalDigits;
        _nullable = nullable;
+       _cat = cat;
+       _schem = schem;
     }
  
***************
*** 61,63 ****
--- 65,77 ----
     }
  
+    public String getCatalog()
+    {
+       return _cat;
+    }
+ 
+    public String getSchema()
+    {
+       return _schem;
+    }
+ 
  }

Index: SchemaInfo.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/SchemaInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SchemaInfo.java	27 Nov 2004 23:36:41 -0000	1.8
--- SchemaInfo.java	17 Feb 2005 23:53:29 -0000	1.9
***************
*** 153,156 ****
--- 153,183 ----
  			}
  
+ 
+          //////////////////////////////////////////////////////////////////////////////////////////////
+          // Set catalog and schema names in the same case sensitive way as they are stored in the DB
+          for (int i = 0; i < _catalogs.size(); i++)
+          {
+             String cat = (String) _catalogs.get(i);
+ 
+             if(("" + _catalogName).equalsIgnoreCase("" + cat))
+             {
+                _catalogName = cat;
+             }
+          }
+ 
+          for (int i = 0; i < _schemas.size(); i++)
+          {
+             String schem = (String) _schemas.get(i);
+ 
+             if(("" + _schemaName).equalsIgnoreCase("" + schem))
+             {
+                _schemaName = schem;
+             }
+          }
+          //
+          /////////////////////////////////////////////////////////////////////////////////////////////
+ 
+ 
+ 
  			try
  			{
***************
*** 700,704 ****
  
  					String tableType = rs.getString("TABLE_TYPE");
! 					_extendedtableInfos.add(new ExtendedTableInfo(tableName, tableType));
  				}
  			}
--- 727,735 ----
  
  					String tableType = rs.getString("TABLE_TYPE");
! 
!                String cat = rs.getString("TABLE_CAT");
!                String schem = rs.getString("TABLE_SCHEM");
! 
! 					_extendedtableInfos.add(new ExtendedTableInfo(tableName, tableType, cat, schem));
  				}
  			}
***************
*** 736,740 ****
                 int decimalDigits = rs.getInt("DECIMAL_DIGITS");
                 boolean nullable = "YES".equals(rs.getString("IS_NULLABLE"));
!                ExtendedColumnInfo buf = new ExtendedColumnInfo(columnName, columnType, columnSize, decimalDigits, nullable);
                 infos.add(buf);
  
--- 767,773 ----
                 int decimalDigits = rs.getInt("DECIMAL_DIGITS");
                 boolean nullable = "YES".equals(rs.getString("IS_NULLABLE"));
!                String cat = rs.getString("TABLE_CAT");
!                String schem = rs.getString("TABLE_SCHEM");
!                ExtendedColumnInfo buf = new ExtendedColumnInfo(columnName, columnType, columnSize, decimalDigits, nullable, cat, schem);
                 infos.add(buf);
  

Index: ExtendedTableInfo.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ExtendedTableInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExtendedTableInfo.java	15 Dec 2003 11:12:00 -0000	1.1
--- ExtendedTableInfo.java	17 Feb 2005 23:53:29 -0000	1.2
***************
*** 21,30 ****
  	private String _tableName;
  	private String _tableType;
  
! 	ExtendedTableInfo(String tableName, String tableType)
  	{
  		_tableName = tableName;
  		_tableType = tableType;
! 	}
  
  	public String getTableName()
--- 21,34 ----
  	private String _tableName;
  	private String _tableType;
+    private String _catalog;
+    private String _schema;
  
!    ExtendedTableInfo(String tableName, String tableType, String catalog, String schema)
  	{
  		_tableName = tableName;
  		_tableType = tableType;
!       _catalog = catalog;
!       _schema = schema;
!    }
  
  	public String getTableName()
***************
*** 38,40 ****
--- 42,54 ----
  	}
  
+    public String getCatalog()
+    {
+       return _catalog;
+    }
+ 
+    public String getSchema()
+    {
+       return _schema;
+    }
+ 
  }
\ No newline at end of file