[teiid-commits] teiid SVN: r4354 - in trunk/connectors/translator-jdbc/src: test/java/org/teiid/translator/jdbc/sybase and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-08-21 13:29:30 -0400 (Tue, 21 Aug 2012)
New Revision: 4354

Modified:
   trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java
   trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java
Log:
TEIID-2157 adding sybase limit for older releases

Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java	2012-08-21 16:45:15 UTC (rev 4353)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java	2012-08-21 17:29:30 UTC (rev 4354)
@@ -58,7 +58,8 @@
 
 @Translator(name="sybase", description="A translator for Sybase Database")
 public class SybaseExecutionFactory extends BaseSybaseExecutionFactory {
-	
+
+	public static final String TWELVE_5_3 = "12.5.3"; //$NON-NLS-1$
 	public static final String TWELVE_5 = "12.5"; //$NON-NLS-1$
 	public static final String FIFTEEN_0_2 = "15.0.2"; //$NON-NLS-1$
 	public static final String FIFTEEN_5 = "15.5"; //$NON-NLS-1$
@@ -370,7 +371,7 @@
 	
 	@Override
 	public boolean supportsRowLimit() {
-		return getDatabaseVersion().compareTo(FIFTEEN_0_2) >= 0;
+		return (getDatabaseVersion().startsWith("12") && getDatabaseVersion().compareTo(TWELVE_5_3) >= 0) || getDatabaseVersion().compareTo(FIFTEEN_0_2) >=0; //$NON-NLS-1$
 	}
 
 	@TranslatorProperty(display="JTDS Driver", description="True if the driver is the JTDS driver",advanced=true)

Modified: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java	2012-08-21 16:45:15 UTC (rev 4353)
+++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseSQLConversionVisitor.java	2012-08-21 17:29:30 UTC (rev 4354)
@@ -35,6 +35,7 @@
 
 /**
  */
+ at SuppressWarnings("nls")
 public class TestSybaseSQLConversionVisitor {
 
     private static SybaseExecutionFactory trans = new SybaseExecutionFactory();
@@ -256,4 +257,16 @@
             "SELECT {fn timestampadd(sql_tsi_second, 1, SmallA.TimestampValue)}, dateadd(millisecond, 1000/1000000, SmallA.TimestampValue), datediff(millisecond, SmallA.TimestampValue,SmallA.TimestampValue)*1000000 FROM SmallA"); //$NON-NLS-1$
     }
     
+    @Test public void testLimitSupport() {
+    	SybaseExecutionFactory sybaseExecutionFactory = new SybaseExecutionFactory();
+    	sybaseExecutionFactory.setDatabaseVersion("12.5.4");
+    	assertTrue(sybaseExecutionFactory.supportsRowLimit());
+    	sybaseExecutionFactory.setDatabaseVersion("12.5.2");
+    	assertFalse(sybaseExecutionFactory.supportsRowLimit());
+    	sybaseExecutionFactory.setDatabaseVersion("15");
+    	assertFalse(sybaseExecutionFactory.supportsRowLimit());
+    	sybaseExecutionFactory.setDatabaseVersion("15.1");
+    	assertTrue(sybaseExecutionFactory.supportsRowLimit());
+    }
+    
 }