rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-04 13:16:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync with jdbc2, remove gratuitous white space differences.

Browse Source
This commit is contained in:
Peter Eisentraut 2001-07-07 15:52:03 +00:00
parent dbf30bba4a
commit ea88062c29
1 changed files with 242 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
View File

@ -424,7 +424,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
} }
/** /**
* Get all the "extra" characters that can bew used in unquoted * Get all the "extra" characters that can be used in unquoted
* identifier names (those beyond a-zA-Z0-9 and _) * identifier names (those beyond a-zA-Z0-9 and _)
* *
* <p>From the file src/backend/parser/scan.l, an identifier is * <p>From the file src/backend/parser/scan.l, an identifier is
@ -523,7 +523,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
} }
/** /**
* Are expressions in "ORCER BY" lists supported? * Are expressions in "ORDER BY" lists supported?
* *
* <br>e.g. select * from t order by a + b; * <br>e.g. select * from t order by a + b;
* *
@ -736,7 +736,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public boolean supportsOuterJoins() throws SQLException public boolean supportsOuterJoins() throws SQLException
{ {
return false; return true; // yes 7.1 does
} }
/** /**
@ -748,7 +748,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public boolean supportsFullOuterJoins() throws SQLException public boolean supportsFullOuterJoins() throws SQLException
{ {
return false; return true; // yes in 7.1
} }
/** /**
@ -760,7 +760,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public boolean supportsLimitedOuterJoins() throws SQLException public boolean supportsLimitedOuterJoins() throws SQLException
{ {
return false; return true; // yes in 7.1
} }
/** /**
@ -1009,7 +1009,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public boolean supportsUnion() throws SQLException public boolean supportsUnion() throws SQLException
{ {
return false; return true; // 7.0?
} }
/** /**
@ -1350,7 +1350,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public int getDefaultTransactionIsolation() throws SQLException public int getDefaultTransactionIsolation() throws SQLException
{ {
return Connection.TRANSACTION_READ_COMMITTED; return Connection.TRANSACTION_READ_COMMITTED;
} }
/** /**
@ -1377,11 +1377,11 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
*/ */
public boolean supportsTransactionIsolationLevel(int level) throws SQLException public boolean supportsTransactionIsolationLevel(int level) throws SQLException
{ {
if (level == Connection.TRANSACTION_SERIALIZABLE || if (level == Connection.TRANSACTION_SERIALIZABLE ||
level == Connection.TRANSACTION_READ_COMMITTED) level == Connection.TRANSACTION_READ_COMMITTED)
return true; return true;
else else
return false; return false;
} }
/** /**
@ -1655,8 +1655,8 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
for(int i=0;i<types.length;i++) { for(int i=0;i<types.length;i++) {
for(int j=0;j<getTableTypes.length;j++) for(int j=0;j<getTableTypes.length;j++)
if(getTableTypes[j][0].equals(types[i])) { if(getTableTypes[j][0].equals(types[i])) {
if(notFirst) if(notFirst)
sql.append(" or "); sql.append(" or ");
sql.append(getTableTypes[j][1]); sql.append(getTableTypes[j][1]);
notFirst=true; notFirst=true;
} }
@ -1723,7 +1723,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
// //
// IMPORTANT: the query must be enclosed in ( ) // IMPORTANT: the query must be enclosed in ( )
private static final String getTableTypes[][] = { private static final String getTableTypes[][] = {
{"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_')"}, {"TABLE", "(relkind='r' and relhasrules='f' and relname !~ '^pg_' and relname !~ '^xinv')"},
{"VIEW", "(relkind='v' and relname !~ '^pg_')"}, {"VIEW", "(relkind='v' and relname !~ '^pg_')"},
{"INDEX", "(relkind='i' and relname !~ '^pg_')"}, {"INDEX", "(relkind='i' and relname !~ '^pg_')"},
{"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"}, {"SEQUENCE", "(relkind='S' and relname !~ '^pg_')"},
@ -2186,8 +2186,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
); );
} }
private void importLoop(Vector tuples, java.sql.ResultSet keyRelation) throws SQLException private void importLoop(Vector tuples, java.sql.ResultSet keyRelation) throws SQLException {
{
String s,s2; String s,s2;
String origTable=null, primTable=new String(""), schema; String origTable=null, primTable=new String(""), schema;
int i; int i;
@ -2262,7 +2261,6 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
//return tuples; //return tuples;
} }
/** /**
* Get a description of the primary key columns that are * Get a description of the primary key columns that are
* referenced by a table's foreign key columns (the primary keys * referenced by a table's foreign key columns (the primary keys
@ -2644,7 +2642,6 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
f[11] = new Field(connection, "PAGES", iInt4Oid, 4); f[11] = new Field(connection, "PAGES", iInt4Oid, 4);
f[12] = new Field(connection, "FILTER_CONDITION", iVarcharOid, 32); f[12] = new Field(connection, "FILTER_CONDITION", iVarcharOid, 32);
r = connection.ExecSQL("select " + r = connection.ExecSQL("select " +
"c.relname, " + "c.relname, " +
"x.indisunique, " + "x.indisunique, " +
@ -2700,5 +2697,5 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
return new ResultSet(connection, f, v, "OK", 1); return new ResultSet(connection, f, v, "OK", 1);
} }
}
}