From 0c07598323addf131647bede3bef2dfa2b4b5d61 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 6 Sep 2011 19:44:52 +0000
Subject: [PATCH] [#800] Add support for Sybase Adaptive Server Enterprise -
 rename "adaptiveserver" into "ase"

---
 jOOQ/src/main/java/org/jooq/SQLDialect.java                | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java    | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Atan2.java                | 2 +-
 jOOQ/src/main/java/org/jooq/impl/BitLength.java            | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Ceil.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Cosh.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java | 2 +-
 jOOQ/src/main/java/org/jooq/impl/DescribeQuery.java        | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Dual.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Euler.java                | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Extract.java              | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Factory.java              | 6 +++---
 jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java   | 2 +-
 jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java      | 6 +++---
 jOOQ/src/main/java/org/jooq/impl/Greatest.java             | 2 +-
 jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java      | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Least.java                | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Limit.java                | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Ln.java                   | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Lpad.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Mod.java                  | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Position.java             | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Repeat.java               | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Replace.java              | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Round.java                | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Rpad.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/SQLDataType.java          | 4 ++--
 jOOQ/src/main/java/org/jooq/impl/Sinh.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java        | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Substring.java            | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Tanh.java                 | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Trim.java                 | 2 +-
 32 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java
index b6a8b3587b..9025f78f6e 100644
--- a/jOOQ/src/main/java/org/jooq/SQLDialect.java
+++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java
@@ -37,7 +37,7 @@
 package org.jooq;
 
 import org.jooq.impl.Factory;
-import org.jooq.util.adaptiveserver.AdaptiveServerFactory;
+import org.jooq.util.ase.ASEFactory;
 import org.jooq.util.db2.DB2Factory;
 import org.jooq.util.derby.DerbyFactory;
 import org.jooq.util.h2.H2Factory;
@@ -68,7 +68,7 @@ public enum SQLDialect {
     /**
      * The Sybase Adaptive Server SQL dialect
      */
-    ADAPTIVESERVER("AdaptiveServer", AdaptiveServerFactory.class),
+    ASE("ASE", ASEFactory.class),
 
     /**
      * The IBM DB2 SQL dialect
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
index c983eba01b..28d5c7c7b6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
@@ -193,7 +193,7 @@ implements
                     break;
                 }
 
-                case ADAPTIVESERVER:
+                case ASE:
                 case SQLSERVER:
                 case SYBASE: {
 
@@ -413,7 +413,7 @@ implements
 
         // SQL Server is a bit different from the other dialects
         switch (context.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER: // No break
             case SYBASE: {
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan2.java b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
index ab07c845d2..21db1fe711 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
@@ -63,7 +63,7 @@ class Atan2 extends AbstractFunction<BigDecimal> {
     @Override
     final Field<BigDecimal> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
                 return new Function<BigDecimal>("atn2", SQLDataType.NUMERIC, arg1, arg2);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
index 2a08569d78..72f2715159 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@@ -59,7 +59,7 @@ class BitLength extends AbstractFunction<Integer> {
     @Override
     final Field<Integer> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
                 return new Function<Integer>("8 * datalength", SQLDataType.INTEGER, argument);
 
             case DB2:    // No break
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
index 5871442cbd..1346395300 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@@ -64,7 +64,7 @@ class Ceil<T> extends AbstractFunction<T> {
             case SQLITE:
                 return argument.add(0.5).round();
 
-            case ADAPTIVESERVER:
+            case ASE:
             case H2:
             case SQLSERVER:
                 return new Function<T>("ceiling", getDataType(), argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
index 5928d814a0..efc8ce176f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -61,7 +61,7 @@ class Cosh extends AbstractFunction<BigDecimal> {
     @Override
     final Field<BigDecimal> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case HSQLDB:
             case INGRES:
             case MYSQL:
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
index 562219ad6a..9076c52d44 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
@@ -133,7 +133,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
                 sql(literal);
                 break;
 
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
             case SYBASE:
                 sql("[").sql(literal).sql("]");
diff --git a/jOOQ/src/main/java/org/jooq/impl/DescribeQuery.java b/jOOQ/src/main/java/org/jooq/impl/DescribeQuery.java
index e11efd5ea6..0a8db5eff3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DescribeQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DescribeQuery.java
@@ -107,7 +107,7 @@ class DescribeQuery<R extends Record> extends AbstractQuery {
         context.sql("select ");
 
         // TODO [#21] Refactor this and correctly implement Limit for Sybase
-        if (context.getDialect() == SQLDialect.ADAPTIVESERVER ||
+        if (context.getDialect() == SQLDialect.ASE ||
             context.getDialect() == SQLDialect.SYBASE ||
             context.getDialect() == SQLDialect.SQLSERVER) {
             context.inline(true)
@@ -120,7 +120,7 @@ class DescribeQuery<R extends Record> extends AbstractQuery {
         context.sql(" ");
 
         // nothing to do here, top clause added at start of statement
-        if (context.getDialect() == SQLDialect.ADAPTIVESERVER ||
+        if (context.getDialect() == SQLDialect.ASE ||
             context.getDialect() == SQLDialect.SYBASE ||
             context.getDialect() == SQLDialect.SQLSERVER) {
         }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Dual.java b/jOOQ/src/main/java/org/jooq/impl/Dual.java
index e998a565e3..c6a024fa00 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Dual.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Dual.java
@@ -76,7 +76,7 @@ class Dual extends AbstractTable<Record> {
                 context.sql("INFORMATION_SCHEMA.SYSTEM_USERS");
                 break;
 
-            case ADAPTIVESERVER:
+            case ASE:
             case INGRES:
             case POSTGRES:
             case SQLITE:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index 8eac19570d..12d84e4fb1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -57,7 +57,7 @@ class Euler extends AbstractFunction<BigDecimal> {
     @Override
     final Field<BigDecimal> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case DB2:
             case DERBY:
             case H2:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Extract.java b/jOOQ/src/main/java/org/jooq/impl/Extract.java
index c285364163..fc855b4060 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Extract.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Extract.java
@@ -129,7 +129,7 @@ class Extract extends AbstractFunction<Integer> {
                         throw new SQLDialectNotSupportedException("DatePart not supported: " + datePart);
                 }
 
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
             case SYBASE:
                 switch (datePart) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index 174056a9d5..0462ce7dff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -1629,7 +1629,7 @@ public class Factory implements Configuration {
                 return select(field).fetchOne(field);
             }
 
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
             case SYBASE: {
                 Field<BigInteger> field = field("@@identity", BigInteger.class);
@@ -2488,7 +2488,7 @@ public class Factory implements Configuration {
      */
     public final Field<Timestamp> currentTimestamp() {
         switch (getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
                 return new Function<Timestamp>("current_bigdatetime", SQLDataType.TIMESTAMP);
 
             case ORACLE:
@@ -2516,7 +2516,7 @@ public class Factory implements Configuration {
      */
     public final Field<String> currentUser() {
         switch (getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
                 return field("user", SQLDataType.VARCHAR);
 
             case ORACLE:
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
index a1243776cb..1d9ac44e44 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
@@ -87,7 +87,7 @@ class FieldMapsForInsert extends AbstractQueryPart {
             switch (context.getDialect()) {
 
                 // Some dialects don't support multi-record inserts
-                case ADAPTIVESERVER:
+                case ASE:
                 case INGRES:
                 case ORACLE:
                 case SQLITE:
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java b/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java
index 2bb102186c..42990782d7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java
@@ -72,7 +72,7 @@ import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.SQLDialectNotSupportedException;
 import org.jooq.UDTRecord;
-import org.jooq.util.adaptiveserver.AdaptiveServerDataType;
+import org.jooq.util.ase.ASEDataType;
 import org.jooq.util.db2.DB2DataType;
 import org.jooq.util.derby.DerbyDataType;
 import org.jooq.util.h2.H2DataType;
@@ -813,8 +813,8 @@ public final class FieldTypeHelper {
 
     public static <T> DataType<T> getDataType(SQLDialect dialect, Class<? extends T> type) {
         switch (dialect) {
-            case ADAPTIVESERVER:
-                return AdaptiveServerDataType.getDataType(type);
+            case ASE:
+                return ASEDataType.getDataType(type);
             case DB2:
                 return DB2DataType.getDataType(type);
             case DERBY:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Greatest.java b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
index ff59aa1425..cd176a9ffa 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Greatest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
@@ -66,7 +66,7 @@ class Greatest<T> extends AbstractFunction<T> {
             // This implementation has O(2^n) complexity. Better implementations
             // are very welcome
 
-            case ADAPTIVESERVER:
+            case ASE:
             case DERBY:
             case SQLSERVER:
             case SYBASE: {
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index 8d8e61be36..5aef191202 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -320,7 +320,7 @@ class InsertQueryImpl<R extends TableRecord<R>> extends AbstractStoreQuery<R> im
 
                 // Some dialects can only return AUTO_INCREMENT values
                 // Other values have to be fetched in a second step
-                case ADAPTIVESERVER:
+                case ASE:
                 case DERBY:
                 case H2:
                 case INGRES:
@@ -383,7 +383,7 @@ class InsertQueryImpl<R extends TableRecord<R>> extends AbstractStoreQuery<R> im
 
                 // Some dialects can only retrieve "identity" (AUTO_INCREMENT) values
                 // Additional values have to be fetched explicitly
-                case ADAPTIVESERVER:
+                case ASE:
                 case DERBY:
                 case H2:
                 case INGRES:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Least.java b/jOOQ/src/main/java/org/jooq/impl/Least.java
index 03b7c9b862..d82d1629bd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Least.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Least.java
@@ -66,7 +66,7 @@ class Least<T> extends AbstractFunction<T> {
             // This implementation has O(2^n) complexity. Better implementations
             // are very welcome
 
-            case ADAPTIVESERVER:
+            case ASE:
             case DERBY:
             case SQLSERVER:
             case SYBASE: {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index 52b43a110d..9f61d38c15 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -148,7 +148,7 @@ class Limit extends AbstractQueryPart {
                 break;
             }
 
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
             case SYBASE: {
                 if (getOffset() != 0) {
@@ -201,7 +201,7 @@ class Limit extends AbstractQueryPart {
 
             // These dialects don't allow bind variables in their TOP clauses
             // -----------------------------------------------------------------
-            case ADAPTIVESERVER:
+            case ASE:
             case DB2:
             case SQLSERVER:
             case SYBASE: {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ln.java b/jOOQ/src/main/java/org/jooq/impl/Ln.java
index 4c45aed370..25fa63cb8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ln.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ln.java
@@ -68,7 +68,7 @@ class Ln extends AbstractFunction<BigDecimal> {
     final Field<BigDecimal> getFunction0(Configuration configuration) {
         if (base == null) {
             switch (configuration.getDialect()) {
-                case ADAPTIVESERVER:
+                case ASE:
                 case H2:
                 case SQLSERVER:
                     return new Function<BigDecimal>("log", SQLDataType.NUMERIC, argument);
@@ -81,7 +81,7 @@ class Ln extends AbstractFunction<BigDecimal> {
             Field<Integer> baseField = create(configuration).literal(base);
 
             switch (configuration.getDialect()) {
-                case ADAPTIVESERVER:
+                case ASE:
                 case DB2:
                 case DERBY:
                 case H2:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index aec5a5a1e3..6fcc112665 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -64,7 +64,7 @@ class Lpad extends AbstractFunction<String> {
     @Override
     final Field<String> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
             case SYBASE: {
                 if (character == null) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java
index 0f856b76b2..e2d58b2b45 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mod.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java
@@ -63,7 +63,7 @@ class Mod<T> extends AbstractFunction<T> {
     @Override
     final Field<T> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLITE:
             case SQLSERVER:
                 return new Expression<T>(MODULO, arg1, arg2);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index cad1dff2c8..ace5890e40 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -76,7 +76,7 @@ class Position extends AbstractFunction<Integer> {
             case ORACLE:
                 return new Function<Integer>("instr", SQLDataType.INTEGER, in, search);
 
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
                 return new Function<Integer>("charindex", SQLDataType.INTEGER, search, in);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index 0aae6949f1..a2b858f844 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -66,7 +66,7 @@ class Repeat extends AbstractFunction<String> {
             case ORACLE:
                 return string.rpad(string.length().mul(count), (Field<String>) string);
 
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
                 return new Function<String>("replicate", SQLDataType.VARCHAR, string, count);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index 2280b6f3fb..5c08801c1e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -55,7 +55,7 @@ class Replace extends AbstractFunction<String> {
     @Override
     final Field<String> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER: {
+            case ASE: {
                 if (getArguments().length == 2) {
                     return new Function<String>("str_replace", SQLDataType.VARCHAR,
                         getArguments()[0], getArguments()[1], val(""));
diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java
index 264503bc51..1fe913e851 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Round.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Round.java
@@ -89,7 +89,7 @@ class Round<T> extends AbstractFunction<T> {
             }
 
             // These dialects have a mandatory decimals argument
-            case ADAPTIVESERVER:
+            case ASE:
             case INGRES:
             case SQLSERVER:
             case SYBASE: {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
index 7831b65d65..ee7d5fc694 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -64,7 +64,7 @@ class Rpad extends AbstractFunction<String> {
     @Override
     final Field<String> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER:
             case SYBASE: {
                 if (character == null) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java
index 1625417427..2681f5aa86 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java
@@ -45,7 +45,7 @@ import java.sql.Types;
 
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.util.adaptiveserver.AdaptiveServerDataType;
+import org.jooq.util.ase.ASEDataType;
 import org.jooq.util.db2.DB2DataType;
 import org.jooq.util.derby.DerbyDataType;
 import org.jooq.util.h2.H2DataType;
@@ -267,7 +267,7 @@ public final class SQLDataType<T> extends AbstractDataType<T> {
         // Load all dialect-specific data types
 
         try {
-            Class.forName(AdaptiveServerDataType.class.getName());
+            Class.forName(ASEDataType.class.getName());
             Class.forName(DB2DataType.class.getName());
             Class.forName(DerbyDataType.class.getName());
             Class.forName(H2DataType.class.getName());
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
index efcf175335..0ca47edcf3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
@@ -61,7 +61,7 @@ class Sinh extends AbstractFunction<BigDecimal> {
     @Override
     final Field<BigDecimal> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case HSQLDB:
             case INGRES:
             case MYSQL:
diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
index b71958598f..f63c1e3553 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
@@ -105,7 +105,7 @@ class SortFieldImpl<T> extends AbstractNamedTypeProviderQueryPart<T> implements
                 case DB2:
 
                 // These dialects don't support this syntax at all
-                case ADAPTIVESERVER:
+                case ASE:
                 case INGRES:
                 case MYSQL:
                 case SQLITE:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index 3b431ea9e8..683f66e455 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -58,7 +58,7 @@ class Substring extends AbstractFunction<String> {
 
         switch (configuration.getDialect()) {
             // Sybase ASE and SQL Server requires 3 arguments
-            case ADAPTIVESERVER:
+            case ASE:
             case SQLSERVER: {
                 if (getArguments().length == 2) {
                     return new Function<String>(functionName, SQLDataType.VARCHAR, getArguments()[0],
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
index f3fd855547..70fac745fe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
@@ -61,7 +61,7 @@ class Tanh extends AbstractFunction<BigDecimal> {
     @Override
     final Field<BigDecimal> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case HSQLDB:
             case INGRES:
             case MYSQL:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index a9d0beb8ff..732f98c546 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -59,7 +59,7 @@ class Trim extends AbstractFunction<String> {
     @Override
     final Field<String> getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
-            case ADAPTIVESERVER:
+            case ASE:
             case INGRES:
             case SQLSERVER:
                 return argument.rtrim().ltrim();