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

Commitb3dd55c

Browse files
author
Barry Lind
committed
Added support for JDBC3. The driver will now build under JDBC3 (i.e. Java 1.4).
This concludes my changes that restructured the code to support JDBC3.The jdbc unit tests were also resturctured to allow different tests betweenjdbc2 and jdbc3, although currently make check (aka ant test) for JDBC3 justruns the JDBC2 tests. Of special note the largeobject/PGblob and PGclobclasses have been moved under the jdbc2/jdbc3 specific directories as theynow differ by jdbc version. Also note that this checkin removes thePostgresqlDataSource and files in the xa directory. A recent checkin hasadded new datasource support that replaces the functionality provided by theseclasses. Modified Files: jdbc/build.xml jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java jdbc/org/postgresql/jdbc2/Array.java jdbc/org/postgresql/jdbc2/Jdbc2CallableStatement.java jdbc/org/postgresql/jdbc2/Jdbc2Connection.java jdbc/org/postgresql/jdbc2/Jdbc2DatabaseMetaData.java jdbc/org/postgresql/jdbc2/Jdbc2PreparedStatement.java jdbc/org/postgresql/jdbc2/Jdbc2ResultSet.java jdbc/org/postgresql/jdbc2/Jdbc2ResultSetMetaData.java jdbc/org/postgresql/jdbc2/Jdbc2Statement.java jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java jdbc/org/postgresql/test/jdbc2/BlobTest.java jdbc/org/postgresql/test/jdbc2/CallableStmtTest.java jdbc/org/postgresql/test/jdbc2/ConnectionTest.java jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java jdbc/org/postgresql/test/jdbc2/DateTest.java jdbc/org/postgresql/test/jdbc2/DriverTest.java jdbc/org/postgresql/test/jdbc2/JBuilderTest.java jdbc/org/postgresql/test/jdbc2/MiscTest.java jdbc/org/postgresql/test/jdbc2/ResultSetTest.java jdbc/org/postgresql/test/jdbc2/TimeTest.java jdbc/org/postgresql/test/jdbc2/TimestampTest.java jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java Added Files: jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java jdbc/org/postgresql/jdbc2/Jdbc2Blob.java jdbc/org/postgresql/jdbc2/Jdbc2Clob.java jdbc/org/postgresql/jdbc3/AbstractJdbc3Blob.java jdbc/org/postgresql/jdbc3/AbstractJdbc3Clob.java jdbc/org/postgresql/jdbc3/AbstractJdbc3Connection.java jdbc/org/postgresql/jdbc3/AbstractJdbc3DatabaseMetaData.java jdbc/org/postgresql/jdbc3/AbstractJdbc3ResultSet.java jdbc/org/postgresql/jdbc3/AbstractJdbc3Statement.java jdbc/org/postgresql/jdbc3/Jdbc3Blob.java jdbc/org/postgresql/jdbc3/Jdbc3CallableStatement.java jdbc/org/postgresql/jdbc3/Jdbc3Clob.java jdbc/org/postgresql/jdbc3/Jdbc3Connection.java jdbc/org/postgresql/jdbc3/Jdbc3DatabaseMetaData.java jdbc/org/postgresql/jdbc3/Jdbc3PreparedStatement.java jdbc/org/postgresql/jdbc3/Jdbc3ResultSet.java jdbc/org/postgresql/jdbc3/Jdbc3ResultSetMetaData.java jdbc/org/postgresql/jdbc3/Jdbc3Statement.java jdbc/org/postgresql/test/TestUtil.java jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java jdbc/org/postgresql/test/jdbc3/Jdbc3TestSuite.java Removed Files: jdbc/org/postgresql/PostgresqlDataSource.java jdbc/org/postgresql/largeobject/PGblob.java jdbc/org/postgresql/largeobject/PGclob.java jdbc/org/postgresql/test/JDBC2Tests.java jdbc/org/postgresql/xa/ClientConnection.java jdbc/org/postgresql/xa/TwoPhaseConnection.java jdbc/org/postgresql/xa/TxConnection.java jdbc/org/postgresql/xa/XAConnectionImpl.java jdbc/org/postgresql/xa/XADataSourceImpl.java
1 parent64a0649 commitb3dd55c

File tree

51 files changed

+2955
-3153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2955
-3153
lines changed

‎src/interfaces/jdbc/build.xml

Lines changed: 69 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
This file now requires Ant 1.4.1. 2002-04-18
88
9-
$Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.27 2002/07/30 13:22:02 davec Exp $
9+
$Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.28 2002/08/14 20:35:39 barry Exp $
1010
1111
-->
1212

@@ -46,6 +46,25 @@
4646
</condition>
4747
<availableproperty="datasource"classname="javax.sql.DataSource"/>
4848
<availableproperty="junit"classname="junit.framework.Test" />
49+
<conditionproperty="jdbc2tests">
50+
<and>
51+
<issetproperty="jdbc2"/>
52+
<issetproperty="junit"/>
53+
</and>
54+
</condition>
55+
<conditionproperty="jdbc2optionaltests">
56+
<and>
57+
<issetproperty="jdbc2"/>
58+
<issetproperty="datasource"/>
59+
<issetproperty="junit"/>
60+
</and>
61+
</condition>
62+
<conditionproperty="jdbc3tests">
63+
<and>
64+
<issetproperty="jdbc3"/>
65+
<issetproperty="junit"/>
66+
</and>
67+
</condition>
4968
</target>
5069

5170

@@ -89,18 +108,10 @@
89108
<excludename="${package}/jdbc2/**"unless="jdbc2"/>
90109
<excludename="${package}/jdbc3/**"unless="jdbc3"/>
91110

92-
<excludename="${package}/largeobject/PGblob.java"if="jdbc1" />
93-
<excludename="${package}/largeobject/PGclob.java"if="jdbc1" />
94-
111+
<excludename="${package}/jdbc2/optional/**"unless="jdbc2" />
95112
<excludename="${package}/jdbc2/optional/**"unless="datasource" />
96113

97-
<excludename="${package}/PostgresqlDataSource.java" />
98-
<excludename="${package}/xa/**" />
99-
100-
<excludename="${package}/test/**"unless="junit" />
101-
<excludename="${package}/test/jdbc2/**"if="jdbc1" />
102-
<excludename="${package}/test/jdbc2/optional/**"unless="datasource" />
103-
<excludename="${package}/test/JDBC2Tests.java"if="jdbc1" />
114+
<excludename="${package}/test/**"/>
104115
</javac>
105116
</target>
106117

@@ -128,8 +139,15 @@
128139
</condition>
129140

130141
<!-- determine the connection class-->
131-
<propertyname="connectclass"value="org.postgresql.jdbc1.Jdbc1Connection" />
132-
<availableproperty="connectclass"value="org.postgresql.jdbc2.Jdbc2Connection"classname="java.lang.ThreadLocal" />
142+
<conditionproperty="connectclass"value="org.postgresql.jdbc1.Jdbc1Connection">
143+
<equals arg1="${jdbc1}" arg2="true"/>
144+
</condition>
145+
<conditionproperty="connectclass"value="org.postgresql.jdbc2.Jdbc2Connection">
146+
<equals arg1="${jdbc2}" arg2="true"/>
147+
</condition>
148+
<conditionproperty="connectclass"value="org.postgresql.jdbc3.Jdbc3Connection">
149+
<equals arg1="${jdbc3}" arg2="true"/>
150+
</condition>
133151

134152
<!-- Some defaults-->
135153
<filtertoken="MAJORVERSION"value="${major}" />
@@ -222,14 +240,31 @@
222240
<propertyname="junit.ui"value="textui" />
223241

224242

225-
<targetname="test"depends="jar"if="junit">
243+
<targetname="test"depends="testjdbc2,testjdbc2optional,testjdbc3">
244+
</target>
245+
246+
<targetname="testjdbc2"depends="jar"if="jdbc2tests">
226247
<javacsrcdir="${srcdir}"destdir="${builddir}"debug="${debug}">
227-
<includename="${package}/test/jdbc2/**"if="jdbc2" />
228-
<includename="${package}/test/jdbc2/**"if="jdbc3" />
248+
<includename="${package}/test/jdbc2/*" />
229249
</javac>
250+
<javafork="yes"classname="junit.${junit.ui}.TestRunner"taskname="junit"failonerror="true">
251+
<argvalue="org.postgresql.test.jdbc2.Jdbc2TestSuite" />
252+
<syspropertykey="database"value="${database}" />
253+
<syspropertykey="username"value="${username}" />
254+
<syspropertykey="password"value="${password}" />
255+
<classpath>
256+
<pathelementlocation="${builddir}" />
257+
<pathelementpath="${java.class.path}" />
258+
</classpath>
259+
</java>
260+
</target>
230261

262+
<targetname="testjdbc2optional"depends="jar"if="jdbc2optionaltests">
263+
<javacsrcdir="${srcdir}"destdir="${builddir}"debug="${debug}">
264+
<includename="${package}/test/jdbc2/optional/**" />
265+
</javac>
231266
<javafork="yes"classname="junit.${junit.ui}.TestRunner"taskname="junit"failonerror="true">
232-
<argvalue="org.postgresql.test.JDBC2Tests" />
267+
<argvalue="org.postgresql.test.jdbc2.optional.OptionalTestSuite" />
233268
<syspropertykey="database"value="${database}" />
234269
<syspropertykey="username"value="${username}" />
235270
<syspropertykey="password"value="${password}" />
@@ -240,4 +275,21 @@
240275
</java>
241276
</target>
242277

278+
<targetname="testjdbc3"depends="jar"if="jdbc3tests">
279+
<javacsrcdir="${srcdir}"destdir="${builddir}"debug="${debug}">
280+
<includename="${package}/test/jdbc3/*" />
281+
</javac>
282+
<javafork="yes"classname="junit.${junit.ui}.TestRunner"taskname="junit"failonerror="true">
283+
<argvalue="org.postgresql.test.jdbc3.Jdbc3TestSuite" />
284+
<syspropertykey="database"value="${database}" />
285+
<syspropertykey="username"value="${username}" />
286+
<syspropertykey="password"value="${password}" />
287+
<classpath>
288+
<pathelementlocation="${builddir}" />
289+
<pathelementpath="${java.class.path}" />
290+
</classpath>
291+
</java>
292+
</target>
293+
294+
243295
</project>

0 commit comments

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