Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita21c096

Browse files
committed
Thanks for your feedback (and patience). Enclosed is my third
attempt at a patch to 7.1.2 to support Array.[I think I've solved the mangled patch problem. Hotmail seems totry to format the text file, so gzipping it should solve thisproblem.]In this patch I've incorporated Barry's feedback. Specifically:1) OIDs are no longer hard-coded into Array.java. In order to support this change I added a getOID(String) method to Field.java which receives a PostgreSQL field type and returns a value from java.sql.Types. I couldn't get away from using OIDs altogether because the JDBC spec for Array specifies that some methods return a ResultSet. This requires I construct Field objects, which means I need OIDs. At least this approach doesn't hard code these values. A Hashtable cache has been added to Field so that an SQL lookup isn't necessary (following the model already in Field.java).2) Rewired the base formatting code in ResultSet.java to use 'to' methods, which are then exposed as static methods in ResultSet. These methods are used in Array to format the data without duplications in the code.3) Artifact call to first() in ResultSet.getArray() removed.Greg Zoller
1 parent1ebbfc1 commita21c096

File tree

3 files changed

+219
-191
lines changed

3 files changed

+219
-191
lines changed

‎src/interfaces/jdbc/org/postgresql/Field.java

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public class Field
2222
publicintsql_type = -1;// The entry in java.sql.Types for this field
2323
publicStringtype_name =null;// The sql type name
2424

25+
privatestaticHashtableoidCache =newHashtable();
26+
2527
/**
2628
* Construct a field based on the information fed to it.
2729
*
@@ -104,6 +106,33 @@ public static int getSQLType(String type_name)
104106
returnsql_type;
105107
}
106108

109+
/**
110+
* This returns the oid for a field of a given data type
111+
* @param type_name PostgreSQL type name
112+
* @return PostgreSQL oid value for a field of this type
113+
*/
114+
publicintgetOID(Stringtype_name )throwsSQLException
115+
{
116+
intoid = -1;
117+
if(type_name !=null) {
118+
IntegeroidValue = (Integer)oidCache.get(type_name );
119+
if(oidValue !=null )
120+
oid =oidValue.intValue();
121+
else {
122+
// it's not in the cache, so perform a query, and add the result to the cache
123+
ResultSetresult = (org.postgresql.ResultSet)conn.ExecSQL("select oid from pg_type where typname='"
124+
+type_name +"'");
125+
if (result.getColumnCount() !=1 ||result.getTupleCount() !=1)
126+
thrownewPSQLException("postgresql.unexpected");
127+
result.next();
128+
oid =Integer.parseInt(result.getString(1));
129+
oidCache.put(type_name,newInteger(oid) );
130+
result.close();
131+
}
132+
}
133+
returnoid;
134+
}
135+
107136
/**
108137
* This table holds the org.postgresql names for the types supported.
109138
* Any types that map to Types.OTHER (eg POINT) don't go into this table.
@@ -126,7 +155,9 @@ public static int getSQLType(String type_name)
126155
"bool",
127156
"date",
128157
"time",
129-
"abstime","timestamp"
158+
"abstime","timestamp",
159+
"_bool","_char","_int2","_int4","_text","_oid","_varchar","_int8",
160+
"_float4","_float8","_abstime","_date","_time","_timestamp","_numeric"
130161
};
131162

132163
/**
@@ -149,7 +180,9 @@ public static int getSQLType(String type_name)
149180
Types.BIT,
150181
Types.DATE,
151182
Types.TIME,
152-
Types.TIMESTAMP,Types.TIMESTAMP
183+
Types.TIMESTAMP,Types.TIMESTAMP,
184+
Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,
185+
Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY,Types.ARRAY
153186
};
154187

155188
/**

‎src/interfaces/jdbc/org/postgresql/errors.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# This is the default errors
2+
postgresql.arr.range:The array index is out of range.
23
postgresql.drv.version:An internal error has occured. Please recompile the driver.
34
postgresql.con.auth:The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client's IP address or Subnet, and that it is using an authentication scheme supported by the driver.
45
postgresql.con.authfail:An error occured while getting the authentication request.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp