You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/06/07 15:04:58 UTC
cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms MySqlRDBMSAdapter.java StandardRDBMSAdapter.java
ozeigermann 2004/06/07 06:04:58
Modified: src/stores/org/apache/slide/store/impl/rdbms
MySqlRDBMSAdapter.java StandardRDBMSAdapter.java
Log:
Port of solution of bug #29359 for MySQL
Revision Changes Path
1.4 +9 -4 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/MySqlRDBMSAdapter.java
Index: MySqlRDBMSAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/MySqlRDBMSAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MySqlRDBMSAdapter.java 11 Feb 2004 11:30:21 -0000 1.3
+++ MySqlRDBMSAdapter.java 7 Jun 2004 13:04:58 -0000 1.4
@@ -61,4 +61,9 @@
}
}
+ protected String convertRevisionNumberToComparable(String revisioNumber) {
+ return "convert("+revisioNumber+", unsigned)";
+ }
+
+
}
1.26 +8 -2 jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/StandardRDBMSAdapter.java
Index: StandardRDBMSAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/StandardRDBMSAdapter.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StandardRDBMSAdapter.java 7 Jun 2004 11:29:13 -0000 1.25
+++ StandardRDBMSAdapter.java 7 Jun 2004 13:04:58 -0000 1.26
@@ -892,8 +892,10 @@
// retrieve revision numbers
try {
statement =
- connection.prepareStatement(
- "select vh.REVISION_NO, b.BRANCH_STRING from VERSION_HISTORY vh, BRANCH b, URI u where vh.BRANCH_ID = b.BRANCH_ID and vh.URI_ID = u.URI_ID and u.URI_STRING = ? order by convert(numeric, vh.REVISION_NO)");
+ connection
+ .prepareStatement(
+ "select vh.REVISION_NO, b.BRANCH_STRING from VERSION_HISTORY vh, BRANCH b, URI u where vh.BRANCH_ID = b.BRANCH_ID and vh.URI_ID = u.URI_ID and u.URI_STRING = ? order by "
+ + convertRevisionNumberToComparable("vh.REVISION_NO"));
statement.setString(1, uri.toString());
res = statement.executeQuery();
while (res.next()) {
@@ -1360,6 +1362,10 @@
// needed as some DBs do not accecpt 'x = NULL', but rather need 'x IS NULL'
protected String getRevisionNumberAsWhereQueryFragement(NodeRevisionNumber revisionNumber) {
return (revisionNumber == null ? " IS NULL" : " = '" + revisionNumber + "'");
+ }
+
+ protected String convertRevisionNumberToComparable(String revisioNumber) {
+ return "convert(numeric, "+revisioNumber+")";
}
protected void close(PreparedStatement statement) {
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org