mirror of
https://github.com/postgres/postgres.git
synced 2025-07-02 09:02:37 +03:00
Indent jdbc case labels using pgjindent.
This commit is contained in:
Bruce Momjian
@ -13,7 +13,7 @@ import org.postgresql.util.PSQLException;
|
||||
/*
|
||||
* This class provides information about the database as a whole.
|
||||
*
|
||||
* $Id: DatabaseMetaData.java,v 1.39 2001/11/19 22:33:38 momjian Exp $
|
||||
* $Id: DatabaseMetaData.java,v 1.40 2001/11/19 23:16:45 momjian Exp $
|
||||
*
|
||||
* <p>Many of the methods here return lists of information in ResultSets. You
|
||||
* can use the normal ResultSet methods such as getString and getInt to
|
||||
@ -1731,20 +1731,20 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
|
||||
String relKind;
|
||||
switch (r.getBytes(3)[0])
|
||||
{
|
||||
case (byte) 'r':
|
||||
relKind = "TABLE";
|
||||
break;
|
||||
case (byte) 'i':
|
||||
relKind = "INDEX";
|
||||
break;
|
||||
case (byte) 'S':
|
||||
relKind = "SEQUENCE";
|
||||
break;
|
||||
case (byte) 'v':
|
||||
relKind = "VIEW";
|
||||
break;
|
||||
default:
|
||||
relKind = null;
|
||||
case (byte) 'r':
|
||||
relKind = "TABLE";
|
||||
break;
|
||||
case (byte) 'i':
|
||||
relKind = "INDEX";
|
||||
break;
|
||||
case (byte) 'S':
|
||||
relKind = "SEQUENCE";
|
||||
break;
|
||||
case (byte) 'v':
|
||||
relKind = "VIEW";
|
||||
break;
|
||||
default:
|
||||
relKind = null;
|
||||
}
|
||||
|
||||
tuple[0] = null; // Catalog name
|
||||
@ -2012,17 +2012,17 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
|
||||
|
||||
tuple[7] = null; // Buffer length
|
||||
// Decimal digits = scale
|
||||
// From the source (see e.g. backend/utils/adt/numeric.c,
|
||||
// From the source (see e.g. backend/utils/adt/numeric.c,
|
||||
// function numeric()) the scale and precision can be calculated
|
||||
// from the typmod value.
|
||||
if (typname.equals("numeric") || typname.equals("decimal"))
|
||||
{
|
||||
int attypmod = r.getInt(8);
|
||||
tuple[8] =
|
||||
Integer.toString((attypmod - VARHDRSZ) & 0xffff).getBytes();
|
||||
if (typname.equals("numeric") || typname.equals("decimal"))
|
||||
{
|
||||
int attypmod = r.getInt(8);
|
||||
tuple[8] =
|
||||
Integer.toString((attypmod - VARHDRSZ) & 0xffff).getBytes();
|
||||
}
|
||||
else
|
||||
tuple[8] = "0".getBytes();
|
||||
tuple[8] = "0".getBytes();
|
||||
|
||||
tuple[9] = "10".getBytes(); // Num Prec Radix - assume decimal
|
||||
tuple[10] = Integer.toString(nullFlag.equals("f") ?
|
||||
@ -2262,7 +2262,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
|
||||
"a.attnum as KEY_SEQ," +
|
||||
"ic.relname as PK_NAME " +
|
||||
" FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a" +
|
||||
" WHERE bc.relkind = 'r' " + // -- not indices
|
||||
" WHERE bc.relkind = 'r' " + // -- not indices
|
||||
" and upper(bc.relname) = upper('" + table + "')" +
|
||||
" and i.indrelid = bc.oid" +
|
||||
" and i.indexrelid = ic.oid" +
|
||||
@ -2274,115 +2274,135 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
|
||||
|
||||
private java.sql.ResultSet getImportedExportedKeys(String catalog, String schema, String primaryTable, String foreignTable) throws SQLException
|
||||
{
|
||||
Field f[]=new Field[14];
|
||||
Field f[] = new Field[14];
|
||||
|
||||
f[0]=new Field(connection, "PKTABLE_CAT", iVarcharOid, 32);
|
||||
f[1]=new Field(connection, "PKTABLE_SCHEM", iVarcharOid, 32);
|
||||
f[2]=new Field(connection, "PKTABLE_NAME", iVarcharOid, 32);
|
||||
f[3]=new Field(connection, "PKCOLUMN_NAME", iVarcharOid, 32);
|
||||
f[4]=new Field(connection, "FKTABLE_CAT", iVarcharOid, 32);
|
||||
f[5]=new Field(connection, "FKTABLE_SCHEM", iVarcharOid, 32);
|
||||
f[6]=new Field(connection, "FKTABLE_NAME", iVarcharOid, 32);
|
||||
f[7]=new Field(connection, "FKCOLUMN_NAME", iVarcharOid, 32);
|
||||
f[8]=new Field(connection, "KEY_SEQ", iInt2Oid, 2);
|
||||
f[9]=new Field(connection, "UPDATE_RULE", iInt2Oid, 2);
|
||||
f[10]=new Field(connection, "DELETE_RULE", iInt2Oid, 2);
|
||||
f[11]=new Field(connection, "FK_NAME", iVarcharOid, 32);
|
||||
f[12]=new Field(connection, "PK_NAME", iVarcharOid, 32);
|
||||
f[13]=new Field(connection, "DEFERRABILITY", iInt2Oid, 2);
|
||||
f[0] = new Field(connection, "PKTABLE_CAT", iVarcharOid, 32);
|
||||
f[1] = new Field(connection, "PKTABLE_SCHEM", iVarcharOid, 32);
|
||||
f[2] = new Field(connection, "PKTABLE_NAME", iVarcharOid, 32);
|
||||
f[3] = new Field(connection, "PKCOLUMN_NAME", iVarcharOid, 32);
|
||||
f[4] = new Field(connection, "FKTABLE_CAT", iVarcharOid, 32);
|
||||
f[5] = new Field(connection, "FKTABLE_SCHEM", iVarcharOid, 32);
|
||||
f[6] = new Field(connection, "FKTABLE_NAME", iVarcharOid, 32);
|
||||
f[7] = new Field(connection, "FKCOLUMN_NAME", iVarcharOid, 32);
|
||||
f[8] = new Field(connection, "KEY_SEQ", iInt2Oid, 2);
|
||||
f[9] = new Field(connection, "UPDATE_RULE", iInt2Oid, 2);
|
||||
f[10] = new Field(connection, "DELETE_RULE", iInt2Oid, 2);
|
||||
f[11] = new Field(connection, "FK_NAME", iVarcharOid, 32);
|
||||
f[12] = new Field(connection, "PK_NAME", iVarcharOid, 32);
|
||||
f[13] = new Field(connection, "DEFERRABILITY", iInt2Oid, 2);
|
||||
|
||||
java.sql.ResultSet rs = connection.ExecSQL("SELECT c.relname,c2.relname,"
|
||||
+ "t.tgconstrname,ic.relname,"
|
||||
+ "t.tgdeferrable,t.tginitdeferred,"
|
||||
+ "t.tgnargs,t.tgargs,p.proname "
|
||||
+ "FROM pg_trigger t,pg_class c,pg_class c2,"
|
||||
+ "pg_class ic,pg_proc p, pg_index i "
|
||||
+ "WHERE t.tgrelid=c.oid AND t.tgconstrrelid=c2.oid "
|
||||
+ "AND t.tgfoid=p.oid AND tgisconstraint "
|
||||
+ ((primaryTable!=null) ? "AND c2.relname='"+primaryTable+"' " : "")
|
||||
+ ((foreignTable!=null) ? "AND c.relname='"+foreignTable+"' " : "")
|
||||
+ "AND i.indrelid=c.oid "
|
||||
+ "AND i.indexrelid=ic.oid AND i.indisprimary "
|
||||
+ "ORDER BY c.relname,c2.relname"
|
||||
);
|
||||
+ "t.tgconstrname,ic.relname,"
|
||||
+ "t.tgdeferrable,t.tginitdeferred,"
|
||||
+ "t.tgnargs,t.tgargs,p.proname "
|
||||
+ "FROM pg_trigger t,pg_class c,pg_class c2,"
|
||||
+ "pg_class ic,pg_proc p, pg_index i "
|
||||
+ "WHERE t.tgrelid=c.oid AND t.tgconstrrelid=c2.oid "
|
||||
+ "AND t.tgfoid=p.oid AND tgisconstraint "
|
||||
+ ((primaryTable != null) ? "AND c2.relname='" + primaryTable + "' " : "")
|
||||
+ ((foreignTable != null) ? "AND c.relname='" + foreignTable + "' " : "")
|
||||
+ "AND i.indrelid=c.oid "
|
||||
+ "AND i.indexrelid=ic.oid AND i.indisprimary "
|
||||
+ "ORDER BY c.relname,c2.relname"
|
||||
);
|
||||
Vector tuples = new Vector();
|
||||
short seq=0;
|
||||
if (rs.next()) {
|
||||
boolean hasMore;
|
||||
do {
|
||||
byte tuple[][]=new byte[14][0];
|
||||
for (int k = 0;k < 14;k++)
|
||||
tuple[k] = null;
|
||||
short seq = 0;
|
||||
if (rs.next())
|
||||
{
|
||||
boolean hasMore;
|
||||
do
|
||||
{
|
||||
byte tuple[][] = new byte[14][0];
|
||||
for (int k = 0;k < 14;k++)
|
||||
tuple[k] = null;
|
||||
|
||||
String fKeyName=rs.getString(3);
|
||||
boolean foundRule=false;
|
||||
do {
|
||||
String proname=rs.getString(9);
|
||||
if (proname!=null && proname.startsWith("RI_FKey_")) {
|
||||
int col=-1;
|
||||
if (proname.endsWith("_upd")) col=9; // UPDATE_RULE
|
||||
else if (proname.endsWith("_del")) col=10; // DELETE_RULE
|
||||
if (col>-1) {
|
||||
String rule=proname.substring(8, proname.length()-4);
|
||||
int action=importedKeyNoAction;
|
||||
if ("cascade".equals(rule)) action=importedKeyCascade;
|
||||
else if ("setnull".equals(rule)) action=importedKeySetNull;
|
||||
else if ("setdefault".equals(rule)) action=importedKeySetDefault;
|
||||
tuple[col]=Integer.toString(action).getBytes();
|
||||
foundRule=true;
|
||||
String fKeyName = rs.getString(3);
|
||||
boolean foundRule = false;
|
||||
do
|
||||
{
|
||||
String proname = rs.getString(9);
|
||||
if (proname != null && proname.startsWith("RI_FKey_"))
|
||||
{
|
||||
int col = -1;
|
||||
if (proname.endsWith("_upd"))
|
||||
col = 9; // UPDATE_RULE
|
||||
else if (proname.endsWith("_del"))
|
||||
col = 10; // DELETE_RULE
|
||||
if (col > -1)
|
||||
{
|
||||
String rule = proname.substring(8, proname.length() - 4);
|
||||
int action = importedKeyNoAction;
|
||||
if ("cascade".equals(rule))
|
||||
action = importedKeyCascade;
|
||||
else if ("setnull".equals(rule))
|
||||
action = importedKeySetNull;
|
||||
else if ("setdefault".equals(rule))
|
||||
action = importedKeySetDefault;
|
||||
tuple[col] = Integer.toString(action).getBytes();
|
||||
foundRule = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
} while ((hasMore=rs.next()) && fKeyName.equals(rs.getString(3)));
|
||||
while ((hasMore = rs.next()) && fKeyName.equals(rs.getString(3)));
|
||||
|
||||
if (foundRule) {
|
||||
tuple[2]=rs.getBytes(2); //PKTABLE_NAME
|
||||
tuple[6]=rs.getBytes(1); //FKTABLE_NAME
|
||||
if (foundRule)
|
||||
{
|
||||
tuple[2] = rs.getBytes(2); //PKTABLE_NAME
|
||||
tuple[6] = rs.getBytes(1); //FKTABLE_NAME
|
||||
|
||||
// Parse the tgargs data
|
||||
StringBuffer fkeyColumns=new StringBuffer();
|
||||
StringBuffer pkeyColumns=new StringBuffer();
|
||||
int numColumns=(rs.getInt(7) >> 1) - 2;
|
||||
String s=rs.getString(8);
|
||||
int pos=s.lastIndexOf("\\000");
|
||||
for(int c=0;c<numColumns;c++) {
|
||||
if (pos>-1) {
|
||||
int pos2=s.lastIndexOf("\\000", pos-1);
|
||||
if (pos2>-1) {
|
||||
if (fkeyColumns.length()>0) fkeyColumns.insert(0, ',');
|
||||
fkeyColumns.insert(0, s.substring(pos2+4, pos)); //FKCOLUMN_NAME
|
||||
pos=s.lastIndexOf("\\000", pos2-1);
|
||||
if (pos>-1) {
|
||||
if (pkeyColumns.length()>0) pkeyColumns.insert(0, ',');
|
||||
pkeyColumns.insert(0, s.substring(pos+4, pos2)); //PKCOLUMN_NAME
|
||||
// Parse the tgargs data
|
||||
StringBuffer fkeyColumns = new StringBuffer();
|
||||
StringBuffer pkeyColumns = new StringBuffer();
|
||||
int numColumns = (rs.getInt(7) >> 1) - 2;
|
||||
String s = rs.getString(8);
|
||||
int pos = s.lastIndexOf("\\000");
|
||||
for (int c = 0;c < numColumns;c++)
|
||||
{
|
||||
if (pos > -1)
|
||||
{
|
||||
int pos2 = s.lastIndexOf("\\000", pos - 1);
|
||||
if (pos2 > -1)
|
||||
{
|
||||
if (fkeyColumns.length() > 0)
|
||||
fkeyColumns.insert(0, ',');
|
||||
fkeyColumns.insert(0, s.substring(pos2 + 4, pos)); //FKCOLUMN_NAME
|
||||
pos = s.lastIndexOf("\\000", pos2 - 1);
|
||||
if (pos > -1)
|
||||
{
|
||||
if (pkeyColumns.length() > 0)
|
||||
pkeyColumns.insert(0, ',');
|
||||
pkeyColumns.insert(0, s.substring(pos + 4, pos2)); //PKCOLUMN_NAME
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
tuple[7] = fkeyColumns.toString().getBytes(); //FKCOLUMN_NAME
|
||||
tuple[3] = pkeyColumns.toString().getBytes(); //PKCOLUMN_NAME
|
||||
|
||||
tuple[8] = Integer.toString(seq++).getBytes(); //KEY_SEQ
|
||||
tuple[11] = fKeyName.getBytes(); //FK_NAME
|
||||
tuple[12] = rs.getBytes(4); //PK_NAME
|
||||
|
||||
// DEFERRABILITY
|
||||
int deferrability = importedKeyNotDeferrable;
|
||||
boolean deferrable = rs.getBoolean(5);
|
||||
boolean initiallyDeferred = rs.getBoolean(6);
|
||||
if (deferrable)
|
||||
{
|
||||
if (initiallyDeferred)
|
||||
deferrability = importedKeyInitiallyDeferred;
|
||||
else
|
||||
deferrability = importedKeyInitiallyImmediate;
|
||||
}
|
||||
tuple[13] = Integer.toString(deferrability).getBytes();
|
||||
|
||||
tuples.addElement(tuple);
|
||||
}
|
||||
}
|
||||
tuple[7]=fkeyColumns.toString().getBytes(); //FKCOLUMN_NAME
|
||||
tuple[3]=pkeyColumns.toString().getBytes(); //PKCOLUMN_NAME
|
||||
while (hasMore);
|
||||
}
|
||||
|
||||
tuple[8]=Integer.toString(seq++).getBytes(); //KEY_SEQ
|
||||
tuple[11]=fKeyName.getBytes(); //FK_NAME
|
||||
tuple[12]=rs.getBytes(4); //PK_NAME
|
||||
|
||||
// DEFERRABILITY
|
||||
int deferrability=importedKeyNotDeferrable;
|
||||
boolean deferrable=rs.getBoolean(5);
|
||||
boolean initiallyDeferred=rs.getBoolean(6);
|
||||
if (deferrable) {
|
||||
if (initiallyDeferred)
|
||||
deferrability=importedKeyInitiallyDeferred;
|
||||
else
|
||||
deferrability=importedKeyInitiallyImmediate;
|
||||
}
|
||||
tuple[13]=Integer.toString(deferrability).getBytes();
|
||||
|
||||
tuples.addElement(tuple);
|
||||
}
|
||||
} while (hasMore);
|
||||
}
|
||||
|
||||
return new ResultSet(connection, f, tuples, "OK", 1);
|
||||
return new ResultSet(connection, f, tuples, "OK", 1);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2496,7 +2516,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
|
||||
*/
|
||||
public java.sql.ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException
|
||||
{
|
||||
return getImportedExportedKeys(catalog, schema, table, null);
|
||||
return getImportedExportedKeys(catalog, schema, table, null);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2557,7 +2577,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
|
||||
*/
|
||||
public java.sql.ResultSet getCrossReference(String primaryCatalog, String primarySchema, String primaryTable, String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException
|
||||
{
|
||||
return getImportedExportedKeys(primaryCatalog, primarySchema, primaryTable, foreignTable);
|
||||
return getImportedExportedKeys(primaryCatalog, primarySchema, primaryTable, foreignTable);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -617,53 +617,53 @@ public class PreparedStatement extends Statement implements java.sql.PreparedSta
|
||||
}
|
||||
switch (targetSqlType)
|
||||
{
|
||||
case Types.TINYINT:
|
||||
case Types.SMALLINT:
|
||||
case Types.INTEGER:
|
||||
case Types.BIGINT:
|
||||
case Types.REAL:
|
||||
case Types.FLOAT:
|
||||
case Types.DOUBLE:
|
||||
case Types.DECIMAL:
|
||||
case Types.NUMERIC:
|
||||
if (x instanceof Boolean)
|
||||
set(parameterIndex, ((Boolean)x).booleanValue() ? "1" : "0");
|
||||
else
|
||||
set(parameterIndex, x.toString());
|
||||
break;
|
||||
case Types.CHAR:
|
||||
case Types.VARCHAR:
|
||||
case Types.LONGVARCHAR:
|
||||
setString(parameterIndex, x.toString());
|
||||
break;
|
||||
case Types.DATE:
|
||||
setDate(parameterIndex, (java.sql.Date)x);
|
||||
break;
|
||||
case Types.TIME:
|
||||
setTime(parameterIndex, (Time)x);
|
||||
break;
|
||||
case Types.TIMESTAMP:
|
||||
setTimestamp(parameterIndex, (Timestamp)x);
|
||||
break;
|
||||
case Types.BIT:
|
||||
if (x instanceof Boolean)
|
||||
{
|
||||
set(parameterIndex, ((Boolean)x).booleanValue() ? "TRUE" : "FALSE");
|
||||
}
|
||||
else
|
||||
{
|
||||
case Types.TINYINT:
|
||||
case Types.SMALLINT:
|
||||
case Types.INTEGER:
|
||||
case Types.BIGINT:
|
||||
case Types.REAL:
|
||||
case Types.FLOAT:
|
||||
case Types.DOUBLE:
|
||||
case Types.DECIMAL:
|
||||
case Types.NUMERIC:
|
||||
if (x instanceof Boolean)
|
||||
set(parameterIndex, ((Boolean)x).booleanValue() ? "1" : "0");
|
||||
else
|
||||
set(parameterIndex, x.toString());
|
||||
break;
|
||||
case Types.CHAR:
|
||||
case Types.VARCHAR:
|
||||
case Types.LONGVARCHAR:
|
||||
setString(parameterIndex, x.toString());
|
||||
break;
|
||||
case Types.DATE:
|
||||
setDate(parameterIndex, (java.sql.Date)x);
|
||||
break;
|
||||
case Types.TIME:
|
||||
setTime(parameterIndex, (Time)x);
|
||||
break;
|
||||
case Types.TIMESTAMP:
|
||||
setTimestamp(parameterIndex, (Timestamp)x);
|
||||
break;
|
||||
case Types.BIT:
|
||||
if (x instanceof Boolean)
|
||||
{
|
||||
set(parameterIndex, ((Boolean)x).booleanValue() ? "TRUE" : "FALSE");
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new PSQLException("postgresql.prep.type");
|
||||
}
|
||||
break;
|
||||
case Types.BINARY:
|
||||
case Types.VARBINARY:
|
||||
setObject(parameterIndex, x);
|
||||
break;
|
||||
case Types.OTHER:
|
||||
setString(parameterIndex, ((PGobject)x).getValue());
|
||||
break;
|
||||
default:
|
||||
throw new PSQLException("postgresql.prep.type");
|
||||
}
|
||||
break;
|
||||
case Types.BINARY:
|
||||
case Types.VARBINARY:
|
||||
setObject(parameterIndex, x);
|
||||
break;
|
||||
case Types.OTHER:
|
||||
setString(parameterIndex, ((PGobject)x).getValue());
|
||||
break;
|
||||
default:
|
||||
throw new PSQLException("postgresql.prep.type");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -394,40 +394,40 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
|
||||
wasNullFlag = (this_row[columnIndex - 1] == null);
|
||||
if (!wasNullFlag)
|
||||
{
|
||||
if (binaryCursor)
|
||||
{
|
||||
//If the data is already binary then just return it
|
||||
return this_row[columnIndex - 1];
|
||||
}
|
||||
else if (connection.haveMinimumCompatibleVersion("7.2"))
|
||||
{
|
||||
//Version 7.2 supports the bytea datatype for byte arrays
|
||||
if (fields[columnIndex - 1].getPGType().equals("bytea"))
|
||||
if (binaryCursor)
|
||||
{
|
||||
return PGbytea.toBytes(getString(columnIndex));
|
||||
//If the data is already binary then just return it
|
||||
return this_row[columnIndex - 1];
|
||||
}
|
||||
else if (connection.haveMinimumCompatibleVersion("7.2"))
|
||||
{
|
||||
//Version 7.2 supports the bytea datatype for byte arrays
|
||||
if (fields[columnIndex - 1].getPGType().equals("bytea"))
|
||||
{
|
||||
return PGbytea.toBytes(getString(columnIndex));
|
||||
}
|
||||
else
|
||||
{
|
||||
return this_row[columnIndex - 1];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return this_row[columnIndex - 1];
|
||||
//Version 7.1 and earlier supports LargeObjects for byte arrays
|
||||
// Handle OID's as BLOBS
|
||||
if ( fields[columnIndex - 1].getOID() == 26)
|
||||
{
|
||||
LargeObjectManager lom = connection.getLargeObjectAPI();
|
||||
LargeObject lob = lom.open(getInt(columnIndex));
|
||||
byte buf[] = lob.read(lob.size());
|
||||
lob.close();
|
||||
return buf;
|
||||
}
|
||||
else
|
||||
{
|
||||
return this_row[columnIndex - 1];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//Version 7.1 and earlier supports LargeObjects for byte arrays
|
||||
// Handle OID's as BLOBS
|
||||
if ( fields[columnIndex - 1].getOID() == 26)
|
||||
{
|
||||
LargeObjectManager lom = connection.getLargeObjectAPI();
|
||||
LargeObject lob = lom.open(getInt(columnIndex));
|
||||
byte buf[] = lob.read(lob.size());
|
||||
lob.close();
|
||||
return buf;
|
||||
}
|
||||
else
|
||||
{
|
||||
return this_row[columnIndex - 1];
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@ -447,10 +447,13 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
|
||||
return null;
|
||||
// length == 10: SQL Date
|
||||
// length > 10: SQL Timestamp, assumes PGDATESTYLE=ISO
|
||||
try {
|
||||
return java.sql.Date.valueOf((s.length() == 10) ? s : s.substring(0,10));
|
||||
} catch (NumberFormatException e) {
|
||||
throw new PSQLException("postgresql.res.baddate", s);
|
||||
try
|
||||
{
|
||||
return java.sql.Date.valueOf((s.length() == 10) ? s : s.substring(0, 10));
|
||||
}
|
||||
catch (NumberFormatException e)
|
||||
{
|
||||
throw new PSQLException("postgresql.res.baddate", s);
|
||||
}
|
||||
}
|
||||
|
||||
@ -926,43 +929,43 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
|
||||
|
||||
switch (field.getSQLType())
|
||||
{
|
||||
case Types.BIT:
|
||||
return new Boolean(getBoolean(columnIndex));
|
||||
case Types.SMALLINT:
|
||||
return new Integer(getInt(columnIndex));
|
||||
case Types.INTEGER:
|
||||
return new Integer(getInt(columnIndex));
|
||||
case Types.BIGINT:
|
||||
return new Long(getLong(columnIndex));
|
||||
case Types.NUMERIC:
|
||||
return getBigDecimal(columnIndex, ((field.getMod() - 4) & 0xffff));
|
||||
case Types.REAL:
|
||||
return new Float(getFloat(columnIndex));
|
||||
case Types.DOUBLE:
|
||||
return new Double(getDouble(columnIndex));
|
||||
case Types.CHAR:
|
||||
case Types.VARCHAR:
|
||||
return getString(columnIndex);
|
||||
case Types.DATE:
|
||||
return getDate(columnIndex);
|
||||
case Types.TIME:
|
||||
return getTime(columnIndex);
|
||||
case Types.TIMESTAMP:
|
||||
return getTimestamp(columnIndex);
|
||||
case Types.BINARY:
|
||||
case Types.VARBINARY:
|
||||
return getBytes(columnIndex);
|
||||
default:
|
||||
String type = field.getPGType();
|
||||
// if the backend doesn't know the type then coerce to String
|
||||
if (type.equals("unknown"))
|
||||
{
|
||||
case Types.BIT:
|
||||
return new Boolean(getBoolean(columnIndex));
|
||||
case Types.SMALLINT:
|
||||
return new Integer(getInt(columnIndex));
|
||||
case Types.INTEGER:
|
||||
return new Integer(getInt(columnIndex));
|
||||
case Types.BIGINT:
|
||||
return new Long(getLong(columnIndex));
|
||||
case Types.NUMERIC:
|
||||
return getBigDecimal(columnIndex, ((field.getMod() - 4) & 0xffff));
|
||||
case Types.REAL:
|
||||
return new Float(getFloat(columnIndex));
|
||||
case Types.DOUBLE:
|
||||
return new Double(getDouble(columnIndex));
|
||||
case Types.CHAR:
|
||||
case Types.VARCHAR:
|
||||
return getString(columnIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
return connection.getObject(field.getPGType(), getString(columnIndex));
|
||||
}
|
||||
case Types.DATE:
|
||||
return getDate(columnIndex);
|
||||
case Types.TIME:
|
||||
return getTime(columnIndex);
|
||||
case Types.TIMESTAMP:
|
||||
return getTimestamp(columnIndex);
|
||||
case Types.BINARY:
|
||||
case Types.VARBINARY:
|
||||
return getBytes(columnIndex);
|
||||
default:
|
||||
String type = field.getPGType();
|
||||
// if the backend doesn't know the type then coerce to String
|
||||
if (type.equals("unknown"))
|
||||
{
|
||||
return getString(columnIndex);
|
||||
}
|
||||
else
|
||||
{
|
||||
return connection.getObject(field.getPGType(), getString(columnIndex));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -78,17 +78,17 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
|
||||
|
||||
switch (sql_type)
|
||||
{
|
||||
case Types.SMALLINT:
|
||||
case Types.INTEGER:
|
||||
case Types.FLOAT:
|
||||
case Types.REAL:
|
||||
case Types.DOUBLE:
|
||||
case Types.DATE:
|
||||
case Types.TIME:
|
||||
case Types.TIMESTAMP:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
case Types.SMALLINT:
|
||||
case Types.INTEGER:
|
||||
case Types.FLOAT:
|
||||
case Types.REAL:
|
||||
case Types.DOUBLE:
|
||||
case Types.DATE:
|
||||
case Types.TIME:
|
||||
case Types.TIMESTAMP:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -112,10 +112,10 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
|
||||
// for further expansion.
|
||||
switch (sql_type)
|
||||
{
|
||||
case Types.OTHER:
|
||||
return true;
|
||||
default:
|
||||
return true;
|
||||
case Types.OTHER:
|
||||
return true;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -167,18 +167,18 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
|
||||
|
||||
switch (sql_type)
|
||||
{
|
||||
case Types.SMALLINT:
|
||||
case Types.INTEGER:
|
||||
case Types.FLOAT:
|
||||
case Types.REAL:
|
||||
case Types.DOUBLE:
|
||||
return true;
|
||||
case Types.DATE:
|
||||
case Types.TIME:
|
||||
case Types.TIMESTAMP:
|
||||
return false; // I don't know about these?
|
||||
default:
|
||||
return false;
|
||||
case Types.SMALLINT:
|
||||
case Types.INTEGER:
|
||||
case Types.FLOAT:
|
||||
case Types.REAL:
|
||||
case Types.DOUBLE:
|
||||
return true;
|
||||
case Types.DATE:
|
||||
case Types.TIME:
|
||||
case Types.TIMESTAMP:
|
||||
return false; // I don't know about these?
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -294,26 +294,26 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
|
||||
|
||||
switch (sql_type)
|
||||
{
|
||||
case Types.SMALLINT:
|
||||
return 5;
|
||||
case Types.INTEGER:
|
||||
return 10;
|
||||
case Types.REAL:
|
||||
return 8;
|
||||
case Types.FLOAT:
|
||||
return 16;
|
||||
case Types.DOUBLE:
|
||||
return 16;
|
||||
case Types.VARCHAR:
|
||||
return 0;
|
||||
case Types.NUMERIC:
|
||||
Field f = getField(column);
|
||||
if (f != null)
|
||||
return ((0xFFFF0000)&f.getMod()) >> 16;
|
||||
else
|
||||
case Types.SMALLINT:
|
||||
return 5;
|
||||
case Types.INTEGER:
|
||||
return 10;
|
||||
case Types.REAL:
|
||||
return 8;
|
||||
case Types.FLOAT:
|
||||
return 16;
|
||||
case Types.DOUBLE:
|
||||
return 16;
|
||||
case Types.VARCHAR:
|
||||
return 0;
|
||||
case Types.NUMERIC:
|
||||
Field f = getField(column);
|
||||
if (f != null)
|
||||
return ((0xFFFF0000)&f.getMod()) >> 16;
|
||||
else
|
||||
return 0;
|
||||
default:
|
||||
return 0;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -331,26 +331,26 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
|
||||
|
||||
switch (sql_type)
|
||||
{
|
||||
case Types.SMALLINT:
|
||||
return 0;
|
||||
case Types.INTEGER:
|
||||
return 0;
|
||||
case Types.REAL:
|
||||
return 8;
|
||||
case Types.FLOAT:
|
||||
return 16;
|
||||
case Types.DOUBLE:
|
||||
return 16;
|
||||
case Types.VARCHAR:
|
||||
return 0;
|
||||
case Types.NUMERIC:
|
||||
Field f = getField(column);
|
||||
if (f != null)
|
||||
return (((0x0000FFFF)&f.getMod()) - 4);
|
||||
else
|
||||
case Types.SMALLINT:
|
||||
return 0;
|
||||
case Types.INTEGER:
|
||||
return 0;
|
||||
case Types.REAL:
|
||||
return 8;
|
||||
case Types.FLOAT:
|
||||
return 16;
|
||||
case Types.DOUBLE:
|
||||
return 16;
|
||||
case Types.VARCHAR:
|
||||
return 0;
|
||||
case Types.NUMERIC:
|
||||
Field f = getField(column);
|
||||
if (f != null)
|
||||
return (((0x0000FFFF)&f.getMod()) - 4);
|
||||
else
|
||||
return 0;
|
||||
default:
|
||||
return 0;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user