diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
index 76be8628c1..aae8374e5a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
@@ -133,6 +133,10 @@ public class Databases {
 
 
             case POSTGRES:         result = PostgresDatabase.class;         break;
+
+
+
+
             case SQLITE:           result = SQLiteDatabase.class;           break;
 
             case DEFAULT:
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
index 04e9ca3108..d3020d53f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
@@ -226,7 +226,7 @@ final class CaseWhenStepImpl<V, T> extends AbstractFunction<T> implements CaseWh
                .visit(K_CASE);
 
             int size = compareValues.size();
-            switch (ctx.configuration().dialect()) {
+            switch (ctx.dialect()) {
 
                 // The DERBY dialect doesn't support the simple CASE clause
                 case DERBY: {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index 19ef97fad4..7b537ba83d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -1444,7 +1444,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
         final BigInteger get0(BindingGetResultSetContext<U> ctx) throws SQLException {
 
             // The SQLite JDBC driver doesn't support BigDecimals
-            if (ctx.configuration().dialect() == SQLDialect.SQLITE)
+            if (ctx.family() == SQLDialect.SQLITE)
                 return Convert.convert(ctx.resultSet().getString(ctx.index()), BigInteger.class);
 
             BigDecimal b = ctx.resultSet().getBigDecimal(ctx.index());
diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java
index f0a86dd684..6239c05627 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Function.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Function.java
@@ -642,7 +642,7 @@ class Function<T> extends AbstractField<T> implements
         if (name != null)
             ctx.visit(name);
         else if (term != null)
-            ctx.sql(term.translate(ctx.configuration().dialect()));
+            ctx.sql(term.translate(ctx.dialect()));
         else
             ctx.sql(getName());
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
index 7532eaa42f..81e5dfc339 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
@@ -82,7 +82,7 @@ final class FunctionTable<R extends Record> extends AbstractTable<R> {
 
     @Override
     public final void accept(Context<?> ctx) {
-        switch (ctx.configuration().dialect()) {
+        switch (ctx.dialect()) {
             case HSQLDB: {
                 ctx.visit(K_TABLE).sql('(').visit(function).sql(')');
                 break;
@@ -99,7 +99,7 @@ final class FunctionTable<R extends Record> extends AbstractTable<R> {
             }
 
             default:
-                throw new SQLDialectNotSupportedException("FUNCTION TABLE is not supported for " + ctx.configuration().dialect());
+                throw new SQLDialectNotSupportedException("FUNCTION TABLE is not supported for " + ctx.dialect());
         }
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index 74168deb19..d97ae593ef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -429,7 +429,7 @@ final class MetaImpl extends AbstractMeta {
 
             // SQLite JDBC's DatabaseMetaData.getColumns() can only return a single
             // table's columns
-            if (columnCache == null && configuration.dialect() != SQLITE) {
+            if (columnCache == null && configuration.family() != SQLITE) {
                 Result<Record> columns = getColumns0(schema, "%");
 
                 Field<String> tableCat   = (Field<String>) columns.field(0); // TABLE_CAT