You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2007/11/20 04:05:37 UTC
svn commit: r596523 - in
/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql:
AbstractSQLServerDictionary.java H2Dictionary.java HSQLDictionary.java
MySQLDictionary.java PostgresDictionary.java
Author: pcl
Date: Mon Nov 19 19:05:36 2007
New Revision: 596523
URL: http://svn.apache.org/viewvc?rev=596523&view=rev
Log:
OPENJPA-447. It looks like some of our DBDictionaries might not be handling ranging properly even after this fix.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java?rev=596523&r1=596522&r2=596523&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractSQLServerDictionary.java Mon Nov 19 19:05:36 2007
@@ -108,7 +108,8 @@
super.setNull(stmnt, idx, colType, col);
}
- protected void appendSelectRange(SQLBuffer buf, long start, long end) {
+ protected void appendSelectRange(SQLBuffer buf, long start, long end,
+ boolean subselect) {
// cannot use a value here, since SQLServer does not support
// bound parameters in a "TOP" clause
buf.append(" TOP ").append(Long.toString(end));
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java?rev=596523&r1=596522&r2=596523&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.java Mon Nov 19 19:05:36 2007
@@ -185,7 +185,8 @@
return cols;
}
- protected void appendSelectRange(SQLBuffer buf, long start, long end) {
+ protected void appendSelectRange(SQLBuffer buf, long start, long end,
+ boolean subselect) {
if (end != Long.MAX_VALUE)
buf.append(" LIMIT ").appendValue(end - start);
if (start != 0)
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java?rev=596523&r1=596522&r2=596523&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java Mon Nov 19 19:05:36 2007
@@ -250,7 +250,8 @@
}
}
- protected void appendSelectRange(SQLBuffer buf, long start, long end) {
+ protected void appendSelectRange(SQLBuffer buf, long start, long end,
+ boolean subselect) {
// HSQL doesn't parameters in range
buf.append(" LIMIT ").append(String.valueOf(start)).append(" ");
if (end == Long.MAX_VALUE)
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java?rev=596523&r1=596522&r2=596523&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MySQLDictionary.java Mon Nov 19 19:05:36 2007
@@ -162,7 +162,8 @@
}
}
- protected void appendSelectRange(SQLBuffer buf, long start, long end) {
+ protected void appendSelectRange(SQLBuffer buf, long start, long end,
+ boolean subselect) {
buf.append(" LIMIT ").appendValue(start).append(", ");
if (end == Long.MAX_VALUE)
buf.appendValue(Long.MAX_VALUE);
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java?rev=596523&r1=596522&r2=596523&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java Mon Nov 19 19:05:36 2007
@@ -241,7 +241,8 @@
stmnt.setNull(idx, colType);
}
- protected void appendSelectRange(SQLBuffer buf, long start, long end) {
+ protected void appendSelectRange(SQLBuffer buf, long start, long end,
+ boolean subselect) {
if (end != Long.MAX_VALUE)
buf.append(" LIMIT ").appendValue(end - start);
if (start != 0)