? built
? jdbcbuild.sh
Index: org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java,v
retrieving revision 1.31
diff -c -r1.31 AbstractJdbc1DatabaseMetaData.java
*** org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java	13 Jan 2004 07:19:29 -0000	1.31
--- org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java	24 Apr 2004 20:57:36 -0000
***************
*** 1759,1765 ****
  				}
  				sql += " ORDER BY PROCEDURE_NAME ";
  		}
! 		return connection.createStatement().executeQuery(sql);
  	}
  
  	/*
--- 1759,1765 ----
  				}
  				sql += " ORDER BY PROCEDURE_NAME ";
  		}
! 		return createMetaDataStatement().executeQuery(sql);
  	}
  
  	/*
***************
*** 1928,1934 ****
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 1928,1939 ----
  		}
  		rs.close();
  
! 		return (ResultSet)((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
! 	}
! 
! 	protected Statement createMetaDataStatement() throws SQLException
! 	{
! 		return connection.createStatement();
  	}
  
  	/*
***************
*** 2083,2089 ****
  		sql += ") ";
  		sql += orderby;
  
! 		return connection.createStatement().executeQuery(sql);
  	}
  
  	private static final Hashtable tableTypeClauses;
--- 2088,2094 ----
  		sql += ") ";
  		sql += orderby;
  
! 		return createMetaDataStatement().executeQuery(sql);
  	}
  
  	private static final Hashtable tableTypeClauses;
***************
*** 2161,2167 ****
  		} else {
  			sql = "SELECT ''::text AS TABLE_SCHEM ORDER BY TABLE_SCHEM";
  		}
! 		return connection.createStatement().executeQuery(sql);
  	}
  
  	/*
--- 2166,2172 ----
  		} else {
  			sql = "SELECT ''::text AS TABLE_SCHEM ORDER BY TABLE_SCHEM";
  		}
! 		return createMetaDataStatement().executeQuery(sql);
  	}
  
  	/*
***************
*** 2184,2190 ****
  		} else {
  			sql = "SELECT datname AS TABLE_CAT FROM pg_database ORDER BY TABLE_CAT";
  		}
! 		return connection.createStatement().executeQuery(sql);
  	}
  
  	/*
--- 2189,2195 ----
  		} else {
  			sql = "SELECT datname AS TABLE_CAT FROM pg_database ORDER BY TABLE_CAT";
  		}
! 		return createMetaDataStatement().executeQuery(sql);
  	}
  
  	/*
***************
*** 2220,2226 ****
  			v.addElement(tuple);
  		}
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 2225,2231 ----
  			v.addElement(tuple);
  		}
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
***************
*** 2394,2400 ****
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 2399,2405 ----
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
***************
*** 2507,2513 ****
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 2512,2518 ----
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
***************
*** 2609,2615 ****
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	private static void sortStringArray(String s[]) {
--- 2614,2620 ----
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	private static void sortStringArray(String s[]) {
***************
*** 2807,2813 ****
  			v.addElement(tuple);
  		}
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 2812,2818 ----
  			v.addElement(tuple);
  		}
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
***************
*** 2877,2883 ****
  		/* Perhaps we should check that the given
  		 * catalog.schema.table actually exists. -KJ
  		 */
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 2882,2888 ----
  		/* Perhaps we should check that the given
  		 * catalog.schema.table actually exists. -KJ
  		 */
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
***************
*** 2929,2935 ****
                          }
  			sql += where+
  			" ORDER BY table_name, pk_name, key_seq";
! 		return connection.createStatement().executeQuery(sql);
  	}
  
  	/**
--- 2934,2940 ----
                          }
  			sql += where+
  			" ORDER BY table_name, pk_name, key_seq";
! 		return createMetaDataStatement().executeQuery(sql);
  	}
  
  	/**
***************
*** 3028,3034 ****
  				sql += " ORDER BY pkn.nspname,pkc.relname,pos.n";
  			}
  
! 			return connection.createStatement().executeQuery(sql);
  		} else if (connection.haveMinimumServerVersion("7.3")) {
  			select = "SELECT DISTINCT n1.nspname as pnspname,n2.nspname as fnspname, ";
  			from = " FROM pg_catalog.pg_namespace n1 "+
--- 3033,3039 ----
  				sql += " ORDER BY pkn.nspname,pkc.relname,pos.n";
  			}
  
! 			return createMetaDataStatement().executeQuery(sql);
  		} else if (connection.haveMinimumServerVersion("7.3")) {
  			select = "SELECT DISTINCT n1.nspname as pnspname,n2.nspname as fnspname, ";
  			from = " FROM pg_catalog.pg_namespace n1 "+
***************
*** 3251,3257 ****
  			tuples.addElement(tuple);
  		}
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, tuples);
  	}
  
  	/*
--- 3256,3262 ----
  			tuples.addElement(tuple);
  		}
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, tuples);
  	}
  
  	/*
***************
*** 3536,3542 ****
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)connection.createStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
--- 3541,3547 ----
  		}
  		rs.close();
  
! 		return (ResultSet) ((BaseStatement)createMetaDataStatement()).createDriverResultSet(f, v);
  	}
  
  	/*
***************
*** 3631,3637 ****
  			sql += " AND i.indisunique ";
  		}
  		sql += " ORDER BY NON_UNIQUE, TYPE, INDEX_NAME, ORDINAL_POSITION ";
! 		return connection.createStatement().executeQuery(sql);
  	}
  
  	/**
--- 3636,3642 ----
  			sql += " AND i.indisunique ";
  		}
  		sql += " ORDER BY NON_UNIQUE, TYPE, INDEX_NAME, ORDINAL_POSITION ";
! 		return createMetaDataStatement().executeQuery(sql);
  	}
  
  	/**
Index: org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java,v
retrieving revision 1.6
diff -c -r1.6 AbstractJdbc2DatabaseMetaData.java
*** org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java	29 May 2003 04:39:48 -0000	1.6
--- org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java	24 Apr 2004 20:57:36 -0000
***************
*** 141,144 ****
--- 141,150 ----
  	{
  		return false;
  	}
+ 	
+ 	protected java.sql.Statement createMetaDataStatement() throws SQLException
+ 	{
+ 		return ((AbstractJdbc2Connection)connection).createStatement(java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY);
+ 	}
+ 
  }