svn commit: r1806888 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java

[ilgrosso]

Author: ilgrosso
Date: Fri Sep  1 06:38:48 2017
New Revision: 1806888

URL: http://svn.apache.org/viewvc?rev=1806888&view=rev
Log:
[OPENJPA-2598] Applying provided patch

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java?rev=1806888&r1=1806887&r2=1806888&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
 Fri Sep  1 06:38:48 2017
@@ -72,7 +72,7 @@ public class SQLServerDictionary extends
         String driverName = meta.getDriverName();
         String url = meta.getURL();
         if (driverVendor == null) {
-            // serverMajorVersion of 8==2000, 9==2005, 10==2008
+            // serverMajorVersion of 8==2000, 9==2005, 10==2008,  11==2012
             if (meta.getDatabaseMajorVersion() >= 9)
                 setSupportsXMLColumn(true);
             if (meta.getDatabaseMajorVersion() >= 10) {
@@ -83,6 +83,12 @@ public class SQLServerDictionary extends
                 timestampTypeName = "DATETIME2";
                 datePrecision = MICRO / 10;
             }
+            if (meta.getDatabaseMajorVersion() >= 11) {
+                //SQLServer 2012 supports range select
+                rangePosition = RANGE_POST_SELECT;      
+                supportsSelectStartIndex = true;
+                supportsSelectEndIndex = true;
+            }
             if (driverName != null) {
                 if (driverName.startsWith("Microsoft SQL Server")) {
                     // v1.1, 1.2, 2.0 or 3.0 driver
@@ -342,4 +348,19 @@ public class SQLServerDictionary extends
         }
         buf.append(")");
     }
+
+    @Override
+    protected void appendSelectRange(SQLBuffer buf, long start, long end, 
boolean subselect) {
+        //SQL Server 2012 supports range select
+        if (this.getMajorVersion() >= 11) {
+            //we need an order by clause....
+            if (!buf.getSQL().contains(" ORDER BY ")) {
+                buf.append(" ORDER BY 1 ");
+            }
+            buf.append(" OFFSET ").append(Long.toString(start)).append(" ROWS 
").
+                    append(" FETCH NEXT ").append(Long.toString(end - 
start)).append(" ROWS ONLY ");
+        } else {
+            super.appendSelectRange(buf, start, end, subselect);
+        }
+    }
 }