Author: tv
Date: Sun Dec 9 16:27:22 2018
New Revision: 1848527
URL: http://svn.apache.org/viewvc?rev=1848527&view=rev
Log:
Native limit/offset-support is now the default
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/NoneAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AbstractAdapter.java
Sun Dec 9 16:27:22 2018
@@ -184,7 +184,7 @@ public abstract class AbstractAdapter im
@Override
public boolean supportsNativeLimit()
{
- return false;
+ return true;
}
/**
@@ -197,7 +197,7 @@ public abstract class AbstractAdapter im
@Override
public boolean supportsNativeOffset()
{
- return false;
+ return true;
}
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/DerbyAdapter.java
Sun Dec 9 16:27:22 2018
@@ -163,32 +163,6 @@ public class DerbyAdapter extends Abstra
}
/**
- * Returns whether the database can natively limit the size of the
ResultSet
- * of a query.
- * Limit is supported since Derby 10.5.1.1.
- *
- * @return true.
- */
- @Override
- public boolean supportsNativeLimit()
- {
- return true;
- }
-
- /**
- * Returns whether the database natively supports returning results
- * starting at an offset position other than 0.
- * Offset is supported since Derby 10.5.1.1.
- *
- * @return true.
- */
- @Override
- public boolean supportsNativeOffset()
- {
- return true;
- }
-
- /**
* Build Derby-style query with limit or offset.
* The resulting query may look like this:
* <pre>
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/HsqldbAdapter.java
Sun Dec 9 16:27:22 2018
@@ -148,7 +148,7 @@ public class HsqldbAdapter extends Abstr
}
/**
- * Generate a LIMIT offset, limit clause if offset > 0
+ * Generate a LIMIT limit OFFSET offset clause if offset > 0
* or an LIMIT limit clause if limit is > 0 and offset
* is 0.
*
@@ -161,46 +161,14 @@ public class HsqldbAdapter extends Abstr
{
if (offset > 0)
{
- if (limit >= 0)
- {
- query.setLimit(Integer.toString(limit));
- }
- else
- {
- // Limit must always be set in mysql if offset is set
- query.setLimit("18446744073709551615");
- }
query.setOffset(Long.toString(offset));
}
- else
+ if (limit >= 0)
{
- if (limit >= 0)
- {
- query.setLimit(Integer.toString(limit));
- }
+ query.setLimit(Integer.toString(limit));
}
query.setPreLimit(null);
query.setPostLimit(null);
}
-
- /**
- * Return true for HSQLDB 2.x
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeLimit()
- */
- @Override
- public boolean supportsNativeLimit()
- {
- return true;
- }
-
- /**
- * Return true for HSQLDB 2.x
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeOffset()
- */
- @Override
- public boolean supportsNativeOffset()
- {
- return true;
- }
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MssqlAdapter.java
Sun Dec 9 16:27:22 2018
@@ -142,17 +142,21 @@ public class MssqlAdapter extends Abstra
}
/**
- * Return true for Sybase
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeLimit()
+ * Returns whether the database natively supports returning results
+ * starting at an offset position other than 0.
+ * Return false for MSSQL
+ *
+ * @return true if the database natively supports returning
+ * results starting at an offset position other than 0.
*/
@Override
- public boolean supportsNativeLimit()
+ public boolean supportsNativeOffset()
{
- return true;
+ return false;
}
/**
- * Modify a query to add limit and offset values for Sybase.
+ * Modify a query to add limit and offset values for MSSQL.
*
* @param query The query to modify
* @param offset the offset Value
@@ -200,7 +204,7 @@ public class MssqlAdapter extends Abstra
* Whether an escape clause in like should be used.
* Example : select * from AUTHOR where AUTHOR.NAME like '\_%' ESCAPE '\';
*
- * Sybase needs this, so this implementation always returns
+ * MSSQL needs this, so this implementation always returns
* <code>true</code>.
*
* @return whether the escape clause should be appended or not.
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/MysqlAdapter.java
Sun Dec 9 16:27:22 2018
@@ -173,24 +173,4 @@ public class MysqlAdapter extends Abstra
query.setPreLimit(null);
query.setPostLimit(null);
}
-
- /**
- * Return true for MySQL
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeLimit()
- */
- @Override
- public boolean supportsNativeLimit()
- {
- return true;
- }
-
- /**
- * Return true for MySQL
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeOffset()
- */
- @Override
- public boolean supportsNativeOffset()
- {
- return true;
- }
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/NoneAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/NoneAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/NoneAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/NoneAdapter.java
Sun Dec 9 16:27:22 2018
@@ -112,4 +112,30 @@ public class NoneAdapter extends Abstrac
{
// empty
}
+
+ /**
+ * Returns whether the database can natively limit the size of the
ResultSet
+ * of a query.
+ *
+ * @return true if the database natively supports limiting the
+ * size of the resultset.
+ */
+ @Override
+ public boolean supportsNativeLimit()
+ {
+ return false;
+ }
+
+ /**
+ * Returns whether the database natively supports returning results
+ * starting at an offset position other than 0.
+ *
+ * @return true if the database natively supports returning
+ * results starting at an offset position other than 0.
+ */
+ @Override
+ public boolean supportsNativeOffset()
+ {
+ return false;
+ }
}
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/OracleAdapter.java
Sun Dec 9 16:27:22 2018
@@ -137,26 +137,6 @@ public class OracleAdapter extends Abstr
}
/**
- * Return true for Oracle
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeLimit()
- */
- @Override
- public boolean supportsNativeLimit()
- {
- return true;
- }
-
- /**
- * Return true for Oracle
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeOffset()
- */
- @Override
- public boolean supportsNativeOffset()
- {
- return true;
- }
-
- /**
* Build Oracle-style query with limit or offset.
* If the original SQL is in variable: query then the requlting
* SQL looks like this:
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java?rev=1848527&r1=1848526&r2=1848527&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/PostgresAdapter.java
Sun Dec 9 16:27:22 2018
@@ -122,26 +122,6 @@ public class PostgresAdapter extends Abs
}
/**
- * Return true for PostgreSQL
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeLimit()
- */
- @Override
- public boolean supportsNativeLimit()
- {
- return true;
- }
-
- /**
- * Return true for PostgreSQL
- * @see org.apache.torque.adapter.AbstractAdapter#supportsNativeOffset()
- */
- @Override
- public boolean supportsNativeOffset()
- {
- return true;
- }
-
- /**
* Generate a LIMIT limit OFFSET offset clause if offset > 0
* or an LIMIT limit clause if limit is > 0 and offset
* is 0.
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
