# JDC -> JDBC retitle 137090 jython: Doesn't build zxJDBC tags 137090 patch thanks
Attached patch builds zxJDBC using libmysql-java and libpgjava, which are in main now. Seems to work well in my testing so far. Seo Sanghyeon
diff -u jython-2.1.0/Makefile jython-2.1.0/Makefile
--- jython-2.1.0/Makefile
+++ jython-2.1.0/Makefile
@@ -8,6 +8,13 @@
.PHONY: installer
SUBDIRS= \
+ com/ziclix/python/sql \
+ com/ziclix/python/sql/connect \
+ com/ziclix/python/sql/handler \
+ com/ziclix/python/sql/pipe \
+ com/ziclix/python/sql/pipe/csv \
+ com/ziclix/python/sql/pipe/db \
+ com/ziclix/python/sql/util \
org/apache/oro/text/regex \
org/python/parser \
org/python/compiler \
diff -u jython-2.1.0/debian/rules jython-2.1.0/debian/rules
--- jython-2.1.0/debian/rules
+++ jython-2.1.0/debian/rules
@@ -32,6 +32,7 @@
# Prepare the jar.
-rm -rf jardir
mkdir jardir
+ cp -r com jardir
cp -r org jardir
cp -r Lib/jxxload_help jardir
rm -rf `find jardir -name CVS`
diff -u jython-2.1.0/debian/control jython-2.1.0/debian/control
--- jython-2.1.0/debian/control
+++ jython-2.1.0/debian/control
@@ -2,7 +2,7 @@
Section: python
Priority: optional
Maintainer: Ben Burton <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.0), fastjar, jikes-gij,
libreadline-java (>= 0.6), libservlet2.3-java, python2.1
+Build-Depends-Indep: debhelper (>> 3.0.0), fastjar, jikes-gij,
libreadline-java (>= 0.6), libservlet2.3-java, libmysql-java, libpgjava,
python2.1
Standards-Version: 3.6.1
Package: jython
diff -u jython-2.1.0/debian/changelog jython-2.1.0/debian/changelog
--- jython-2.1.0/debian/changelog
+++ jython-2.1.0/debian/changelog
@@ -1,3 +1,10 @@
+jython (2.1.0-20.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build zxJDBC using libmysql-java and libpgjava (closes: #137090).
+
+ -- Seo Sanghyeon <[EMAIL PROTECTED]> Sun, 17 Jul 2005 00:00:07 +0900
+
jython (2.1.0-20) unstable; urgency=low
* Use libservlet2.3-java instead of libservlet2.2-java (closes: #301042).
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/connect/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/connect/Makefile
@@ -0,0 +1,2 @@
+include ../../../../../Misc/make.rules
+CLASSPATH = ../../../../..
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/handler/MySQLDataHandler.java
+++ jython-2.1.0/com/ziclix/python/sql/handler/MySQLDataHandler.java
@@ -44,8 +44,8 @@
*/
public PyObject getRowId(Statement stmt) throws SQLException {
- if (stmt instanceof org.gjt.mm.mysql.Statement) {
- return
Py.newInteger(((org.gjt.mm.mysql.Statement)stmt).getLastInsertID());
+ if (stmt instanceof com.mysql.jdbc.Statement) {
+ return
Py.newInteger(((com.mysql.jdbc.Statement)stmt).getLastInsertID());
}
return super.getRowId(stmt);
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/handler/PostgresqlDataHandler.java
+++ jython-2.1.0/com/ziclix/python/sql/handler/PostgresqlDataHandler.java
@@ -48,8 +48,8 @@
*/
public PyObject getRowId(Statement stmt) throws SQLException {
- if (stmt instanceof org.postgresql.Statement) {
- return
Py.newInteger(((org.postgresql.Statement)stmt).getInsertedOID());
+ if (stmt instanceof org.postgresql.PGStatement) {
+ return
Py.newInteger(((org.postgresql.PGStatement)stmt).getLastOID());
}
return super.getRowId(stmt);
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/handler/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/handler/Makefile
@@ -0,0 +1,3 @@
+SKIP = InformixDataHandler.class OracleDataHandler.class
+include ../../../../../Misc/make.rules
+CLASSPATH =
../../../../..:/usr/share/java/mysql.jar:/usr/share/java/postgresql.jar
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/pipe/csv/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/pipe/csv/Makefile
@@ -0,0 +1,2 @@
+include ../../../../../../Misc/make.rules
+CLASSPATH = ../../../../../..
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/pipe/db/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/pipe/db/Makefile
@@ -0,0 +1,2 @@
+include ../../../../../../Misc/make.rules
+CLASSPATH = ../../../../../..
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/pipe/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/pipe/Makefile
@@ -0,0 +1,2 @@
+include ../../../../../Misc/make.rules
+CLASSPATH = ../../../../..
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/util/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/util/Makefile
@@ -0,0 +1,2 @@
+include ../../../../../Misc/make.rules
+CLASSPATH = ../../../../..
only in patch2:
unchanged:
--- jython-2.1.0.orig/com/ziclix/python/sql/Makefile
+++ jython-2.1.0/com/ziclix/python/sql/Makefile
@@ -0,0 +1,2 @@
+include ../../../../Misc/make.rules
+CLASSPATH = ../../../..
signature.asc
Description: Digital signature
