diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/Tables.java
index 78101dd2d7..e350f964a8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/Tables.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/Tables.java
@@ -12,111 +12,26 @@ package org.jooq.util.firebird.rdb;
                             comments = "This class is generated by jOOQ")
 public final class Tables {
 
-	/**
-	 * The table RDB$BACKUP_HISTORY
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$backupHistory RDB$BACKUP_HISTORY = org.jooq.util.firebird.rdb.tables.Rdb$backupHistory.RDB$BACKUP_HISTORY;
-
 	/**
 	 * The table RDB$CHARACTER_SETS
 	 */
 	public static final org.jooq.util.firebird.rdb.tables.Rdb$characterSets RDB$CHARACTER_SETS = org.jooq.util.firebird.rdb.tables.Rdb$characterSets.RDB$CHARACTER_SETS;
 
-	/**
-	 * The table RDB$CHECK_CONSTRAINTS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints RDB$CHECK_CONSTRAINTS = org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints.RDB$CHECK_CONSTRAINTS;
-
-	/**
-	 * The table RDB$COLLATIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$collations RDB$COLLATIONS = org.jooq.util.firebird.rdb.tables.Rdb$collations.RDB$COLLATIONS;
-
-	/**
-	 * The table RDB$DATABASE
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$database RDB$DATABASE = org.jooq.util.firebird.rdb.tables.Rdb$database.RDB$DATABASE;
-
 	/**
 	 * The table RDB$DEPENDENCIES
 	 */
 	public static final org.jooq.util.firebird.rdb.tables.Rdb$dependencies RDB$DEPENDENCIES = org.jooq.util.firebird.rdb.tables.Rdb$dependencies.RDB$DEPENDENCIES;
 
-	/**
-	 * The table RDB$EXCEPTIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$exceptions RDB$EXCEPTIONS = org.jooq.util.firebird.rdb.tables.Rdb$exceptions.RDB$EXCEPTIONS;
-
 	/**
 	 * The table RDB$FIELDS
 	 */
 	public static final org.jooq.util.firebird.rdb.tables.Rdb$fields RDB$FIELDS = org.jooq.util.firebird.rdb.tables.Rdb$fields.RDB$FIELDS;
 
-	/**
-	 * The table RDB$FIELD_DIMENSIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions RDB$FIELD_DIMENSIONS = org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions.RDB$FIELD_DIMENSIONS;
-
-	/**
-	 * The table RDB$FILES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$files RDB$FILES = org.jooq.util.firebird.rdb.tables.Rdb$files.RDB$FILES;
-
-	/**
-	 * The table RDB$FILTERS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$filters RDB$FILTERS = org.jooq.util.firebird.rdb.tables.Rdb$filters.RDB$FILTERS;
-
-	/**
-	 * The table RDB$FORMATS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$formats RDB$FORMATS = org.jooq.util.firebird.rdb.tables.Rdb$formats.RDB$FORMATS;
-
-	/**
-	 * The table RDB$FUNCTIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$functions RDB$FUNCTIONS = org.jooq.util.firebird.rdb.tables.Rdb$functions.RDB$FUNCTIONS;
-
-	/**
-	 * The table RDB$FUNCTION_ARGUMENTS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$functionArguments RDB$FUNCTION_ARGUMENTS = org.jooq.util.firebird.rdb.tables.Rdb$functionArguments.RDB$FUNCTION_ARGUMENTS;
-
-	/**
-	 * The table RDB$GENERATORS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$generators RDB$GENERATORS = org.jooq.util.firebird.rdb.tables.Rdb$generators.RDB$GENERATORS;
-
 	/**
 	 * The table RDB$INDEX_SEGMENTS
 	 */
 	public static final org.jooq.util.firebird.rdb.tables.Rdb$indexSegments RDB$INDEX_SEGMENTS = org.jooq.util.firebird.rdb.tables.Rdb$indexSegments.RDB$INDEX_SEGMENTS;
 
-	/**
-	 * The table RDB$INDICES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$indices RDB$INDICES = org.jooq.util.firebird.rdb.tables.Rdb$indices.RDB$INDICES;
-
-	/**
-	 * The table RDB$LOG_FILES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$logFiles RDB$LOG_FILES = org.jooq.util.firebird.rdb.tables.Rdb$logFiles.RDB$LOG_FILES;
-
-	/**
-	 * The table RDB$PAGES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$pages RDB$PAGES = org.jooq.util.firebird.rdb.tables.Rdb$pages.RDB$PAGES;
-
-	/**
-	 * The table RDB$PROCEDURES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$procedures RDB$PROCEDURES = org.jooq.util.firebird.rdb.tables.Rdb$procedures.RDB$PROCEDURES;
-
-	/**
-	 * The table RDB$PROCEDURE_PARAMETERS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters RDB$PROCEDURE_PARAMETERS = org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters.RDB$PROCEDURE_PARAMETERS;
-
 	/**
 	 * The table RDB$REF_CONSTRAINTS
 	 */
@@ -137,46 +52,6 @@ public final class Tables {
 	 */
 	public static final org.jooq.util.firebird.rdb.tables.Rdb$relationFields RDB$RELATION_FIELDS = org.jooq.util.firebird.rdb.tables.Rdb$relationFields.RDB$RELATION_FIELDS;
 
-	/**
-	 * The table RDB$ROLES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$roles RDB$ROLES = org.jooq.util.firebird.rdb.tables.Rdb$roles.RDB$ROLES;
-
-	/**
-	 * The table RDB$SECURITY_CLASSES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$securityClasses RDB$SECURITY_CLASSES = org.jooq.util.firebird.rdb.tables.Rdb$securityClasses.RDB$SECURITY_CLASSES;
-
-	/**
-	 * The table RDB$TRANSACTIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$transactions RDB$TRANSACTIONS = org.jooq.util.firebird.rdb.tables.Rdb$transactions.RDB$TRANSACTIONS;
-
-	/**
-	 * The table RDB$TRIGGERS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$triggers RDB$TRIGGERS = org.jooq.util.firebird.rdb.tables.Rdb$triggers.RDB$TRIGGERS;
-
-	/**
-	 * The table RDB$TRIGGER_MESSAGES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages RDB$TRIGGER_MESSAGES = org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages.RDB$TRIGGER_MESSAGES;
-
-	/**
-	 * The table RDB$TYPES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$types RDB$TYPES = org.jooq.util.firebird.rdb.tables.Rdb$types.RDB$TYPES;
-
-	/**
-	 * The table RDB$USER_PRIVILEGES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges RDB$USER_PRIVILEGES = org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges.RDB$USER_PRIVILEGES;
-
-	/**
-	 * The table RDB$VIEW_RELATIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$viewRelations RDB$VIEW_RELATIONS = org.jooq.util.firebird.rdb.tables.Rdb$viewRelations.RDB$VIEW_RELATIONS;
-
 	/**
 	 * No instances
 	 */
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$backupHistory.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$backupHistory.java
deleted file mode 100644
index 945e5e18cc..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$backupHistory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$backupHistory extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -1530269690;
-
-	/**
-	 * The singleton instance of RDB$BACKUP_HISTORY
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$backupHistory RDB$BACKUP_HISTORY = new org.jooq.util.firebird.rdb.tables.Rdb$backupHistory();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$BACKUP_HISTORY.RDB$BACKUP_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$BACKUP_ID = createField("RDB$BACKUP_ID", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$BACKUP_HISTORY.RDB$TIMESTAMP</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> RDB$TIMESTAMP = createField("RDB$TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP, this);
-
-	/**
-	 * The table column <code>RDB$BACKUP_HISTORY.RDB$BACKUP_LEVEL</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$BACKUP_LEVEL = createField("RDB$BACKUP_LEVEL", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$BACKUP_HISTORY.RDB$GUID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$GUID = createField("RDB$GUID", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$BACKUP_HISTORY.RDB$SCN</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$SCN = createField("RDB$SCN", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$BACKUP_HISTORY.RDB$FILE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FILE_NAME = createField("RDB$FILE_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	public Rdb$backupHistory() {
-		super("RDB$BACKUP_HISTORY");
-	}
-
-	public Rdb$backupHistory(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$backupHistory.RDB$BACKUP_HISTORY);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$backupHistory as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$backupHistory(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$checkConstraints.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$checkConstraints.java
deleted file mode 100644
index 033e92a2b8..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$checkConstraints.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$checkConstraints extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -734289718;
-
-	/**
-	 * The singleton instance of RDB$CHECK_CONSTRAINTS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints RDB$CHECK_CONSTRAINTS = new org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$CHECK_CONSTRAINTS.RDB$CONSTRAINT_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$CONSTRAINT_NAME = createField("RDB$CONSTRAINT_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$CHECK_CONSTRAINTS.RDB$TRIGGER_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$TRIGGER_NAME = createField("RDB$TRIGGER_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	public Rdb$checkConstraints() {
-		super("RDB$CHECK_CONSTRAINTS");
-	}
-
-	public Rdb$checkConstraints(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints.RDB$CHECK_CONSTRAINTS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$checkConstraints(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$collations.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$collations.java
deleted file mode 100644
index 280b98cfe9..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$collations.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$collations extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 972374576;
-
-	/**
-	 * The singleton instance of RDB$COLLATIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$collations RDB$COLLATIONS = new org.jooq.util.firebird.rdb.tables.Rdb$collations();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$COLLATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$COLLATION_NAME = createField("RDB$COLLATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$COLLATION_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$COLLATION_ID = createField("RDB$COLLATION_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$CHARACTER_SET_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$CHARACTER_SET_ID = createField("RDB$CHARACTER_SET_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$COLLATION_ATTRIBUTES</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$COLLATION_ATTRIBUTES = createField("RDB$COLLATION_ATTRIBUTES", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$FUNCTION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FUNCTION_NAME = createField("RDB$FUNCTION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$BASE_COLLATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$BASE_COLLATION_NAME = createField("RDB$BASE_COLLATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$COLLATIONS.RDB$SPECIFIC_ATTRIBUTES</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$SPECIFIC_ATTRIBUTES = createField("RDB$SPECIFIC_ATTRIBUTES", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$collations() {
-		super("RDB$COLLATIONS");
-	}
-
-	public Rdb$collations(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$collations.RDB$COLLATIONS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$collations as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$collations(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$database.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$database.java
deleted file mode 100644
index a4477d5759..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$database.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$database extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 1453748145;
-
-	/**
-	 * The singleton instance of RDB$DATABASE
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$database RDB$DATABASE = new org.jooq.util.firebird.rdb.tables.Rdb$database();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$DATABASE.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$DATABASE.RDB$RELATION_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$RELATION_ID = createField("RDB$RELATION_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$DATABASE.RDB$SECURITY_CLASS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$SECURITY_CLASS = createField("RDB$SECURITY_CLASS", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$DATABASE.RDB$CHARACTER_SET_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$CHARACTER_SET_NAME = createField("RDB$CHARACTER_SET_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	public Rdb$database() {
-		super("RDB$DATABASE");
-	}
-
-	public Rdb$database(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$database.RDB$DATABASE);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$database as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$database(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$exceptions.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$exceptions.java
deleted file mode 100644
index 0b20c7a852..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$exceptions.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$exceptions extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 783708328;
-
-	/**
-	 * The singleton instance of RDB$EXCEPTIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$exceptions RDB$EXCEPTIONS = new org.jooq.util.firebird.rdb.tables.Rdb$exceptions();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$EXCEPTIONS.RDB$EXCEPTION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$EXCEPTION_NAME = createField("RDB$EXCEPTION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$EXCEPTIONS.RDB$EXCEPTION_NUMBER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$EXCEPTION_NUMBER = createField("RDB$EXCEPTION_NUMBER", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$EXCEPTIONS.RDB$MESSAGE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$MESSAGE = createField("RDB$MESSAGE", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	/**
-	 * The table column <code>RDB$EXCEPTIONS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$EXCEPTIONS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$exceptions() {
-		super("RDB$EXCEPTIONS");
-	}
-
-	public Rdb$exceptions(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$exceptions.RDB$EXCEPTIONS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$exceptions as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$exceptions(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$fieldDimensions.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$fieldDimensions.java
deleted file mode 100644
index 474aba5da1..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$fieldDimensions.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$fieldDimensions extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 695485365;
-
-	/**
-	 * The singleton instance of RDB$FIELD_DIMENSIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions RDB$FIELD_DIMENSIONS = new org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$FIELD_DIMENSIONS.RDB$FIELD_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FIELD_NAME = createField("RDB$FIELD_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FIELD_DIMENSIONS.RDB$DIMENSION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$DIMENSION = createField("RDB$DIMENSION", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FIELD_DIMENSIONS.RDB$LOWER_BOUND</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$LOWER_BOUND = createField("RDB$LOWER_BOUND", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$FIELD_DIMENSIONS.RDB$UPPER_BOUND</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$UPPER_BOUND = createField("RDB$UPPER_BOUND", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	public Rdb$fieldDimensions() {
-		super("RDB$FIELD_DIMENSIONS");
-	}
-
-	public Rdb$fieldDimensions(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions.RDB$FIELD_DIMENSIONS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$fieldDimensions(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$files.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$files.java
deleted file mode 100644
index f21d346025..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$files.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$files extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -143496865;
-
-	/**
-	 * The singleton instance of RDB$FILES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$files RDB$FILES = new org.jooq.util.firebird.rdb.tables.Rdb$files();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$FILES.RDB$FILE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FILE_NAME = createField("RDB$FILE_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	/**
-	 * The table column <code>RDB$FILES.RDB$FILE_SEQUENCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FILE_SEQUENCE = createField("RDB$FILE_SEQUENCE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FILES.RDB$FILE_START</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$FILE_START = createField("RDB$FILE_START", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$FILES.RDB$FILE_LENGTH</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$FILE_LENGTH = createField("RDB$FILE_LENGTH", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$FILES.RDB$FILE_FLAGS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FILE_FLAGS = createField("RDB$FILE_FLAGS", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FILES.RDB$SHADOW_NUMBER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SHADOW_NUMBER = createField("RDB$SHADOW_NUMBER", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$files() {
-		super("RDB$FILES");
-	}
-
-	public Rdb$files(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$files.RDB$FILES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$files as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$files(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$filters.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$filters.java
deleted file mode 100644
index 9eb4b1b990..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$filters.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$filters extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -1522463936;
-
-	/**
-	 * The singleton instance of RDB$FILTERS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$filters RDB$FILTERS = new org.jooq.util.firebird.rdb.tables.Rdb$filters();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$FUNCTION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FUNCTION_NAME = createField("RDB$FUNCTION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$MODULE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$MODULE_NAME = createField("RDB$MODULE_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$ENTRYPOINT</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$ENTRYPOINT = createField("RDB$ENTRYPOINT", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$INPUT_SUB_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$INPUT_SUB_TYPE = createField("RDB$INPUT_SUB_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$OUTPUT_SUB_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$OUTPUT_SUB_TYPE = createField("RDB$OUTPUT_SUB_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FILTERS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$filters() {
-		super("RDB$FILTERS");
-	}
-
-	public Rdb$filters(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$filters.RDB$FILTERS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$filters as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$filters(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$formats.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$formats.java
deleted file mode 100644
index a78369e359..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$formats.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$formats extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 1434250906;
-
-	/**
-	 * The singleton instance of RDB$FORMATS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$formats RDB$FORMATS = new org.jooq.util.firebird.rdb.tables.Rdb$formats();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$FORMATS.RDB$RELATION_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$RELATION_ID = createField("RDB$RELATION_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FORMATS.RDB$FORMAT</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FORMAT = createField("RDB$FORMAT", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FORMATS.RDB$DESCRIPTOR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTOR = createField("RDB$DESCRIPTOR", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$formats() {
-		super("RDB$FORMATS");
-	}
-
-	public Rdb$formats(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$formats.RDB$FORMATS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$formats as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$formats(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$functionArguments.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$functionArguments.java
deleted file mode 100644
index b7fda3a12b..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$functionArguments.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$functionArguments extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -898102636;
-
-	/**
-	 * The singleton instance of RDB$FUNCTION_ARGUMENTS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$functionArguments RDB$FUNCTION_ARGUMENTS = new org.jooq.util.firebird.rdb.tables.Rdb$functionArguments();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$FUNCTION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FUNCTION_NAME = createField("RDB$FUNCTION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$ARGUMENT_POSITION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$ARGUMENT_POSITION = createField("RDB$ARGUMENT_POSITION", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$MECHANISM</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$MECHANISM = createField("RDB$MECHANISM", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$FIELD_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FIELD_TYPE = createField("RDB$FIELD_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$FIELD_SCALE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FIELD_SCALE = createField("RDB$FIELD_SCALE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$FIELD_LENGTH</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FIELD_LENGTH = createField("RDB$FIELD_LENGTH", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$FIELD_SUB_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FIELD_SUB_TYPE = createField("RDB$FIELD_SUB_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$CHARACTER_SET_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$CHARACTER_SET_ID = createField("RDB$CHARACTER_SET_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$FIELD_PRECISION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FIELD_PRECISION = createField("RDB$FIELD_PRECISION", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTION_ARGUMENTS.RDB$CHARACTER_LENGTH</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$CHARACTER_LENGTH = createField("RDB$CHARACTER_LENGTH", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$functionArguments() {
-		super("RDB$FUNCTION_ARGUMENTS");
-	}
-
-	public Rdb$functionArguments(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$functionArguments.RDB$FUNCTION_ARGUMENTS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$functionArguments as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$functionArguments(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$functions.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$functions.java
deleted file mode 100644
index d0a40af41c..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$functions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$functions extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 810890782;
-
-	/**
-	 * The singleton instance of RDB$FUNCTIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$functions RDB$FUNCTIONS = new org.jooq.util.firebird.rdb.tables.Rdb$functions();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$FUNCTION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FUNCTION_NAME = createField("RDB$FUNCTION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$FUNCTION_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FUNCTION_TYPE = createField("RDB$FUNCTION_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$QUERY_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$QUERY_NAME = createField("RDB$QUERY_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$MODULE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$MODULE_NAME = createField("RDB$MODULE_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$ENTRYPOINT</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$ENTRYPOINT = createField("RDB$ENTRYPOINT", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$RETURN_ARGUMENT</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$RETURN_ARGUMENT = createField("RDB$RETURN_ARGUMENT", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$FUNCTIONS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$functions() {
-		super("RDB$FUNCTIONS");
-	}
-
-	public Rdb$functions(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$functions.RDB$FUNCTIONS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$functions as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$functions(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$generators.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$generators.java
deleted file mode 100644
index 4fb7a77a23..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$generators.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$generators extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -982746191;
-
-	/**
-	 * The singleton instance of RDB$GENERATORS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$generators RDB$GENERATORS = new org.jooq.util.firebird.rdb.tables.Rdb$generators();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$GENERATORS.RDB$GENERATOR_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$GENERATOR_NAME = createField("RDB$GENERATOR_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$GENERATORS.RDB$GENERATOR_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$GENERATOR_ID = createField("RDB$GENERATOR_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$GENERATORS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$GENERATORS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$generators() {
-		super("RDB$GENERATORS");
-	}
-
-	public Rdb$generators(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$generators.RDB$GENERATORS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$generators as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$generators(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indexSegments.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indexSegments.java
index 67c1ad922f..a3b2c046f8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indexSegments.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indexSegments.java
@@ -10,7 +10,7 @@ package org.jooq.util.firebird.rdb.tables;
                             comments = "This class is generated by jOOQ")
 public class Rdb$indexSegments extends org.jooq.impl.TableImpl<org.jooq.Record> {
 
-	private static final long serialVersionUID = -1869575154;
+	private static final long serialVersionUID = -627728362;
 
 	/**
 	 * The singleton instance of RDB$INDEX_SEGMENTS
@@ -43,10 +43,10 @@ public class Rdb$indexSegments extends org.jooq.impl.TableImpl<org.jooq.Record>
 	/**
 	 * The table column <code>RDB$INDEX_SEGMENTS.RDB$STATISTICS</code>
 	 * <p>
-	 * The SQL type of this item (DOUBLE   ) could not be mapped.<br/>
+	 * The SQL type of this item (DOUBLE) could not be mapped.<br/>
 	 * Deserialising this field might not work!
 	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> RDB$STATISTICS = createField("RDB$STATISTICS", org.jooq.util.firebird.FirebirdDataType.getDefaultDataType("DOUBLE   "), this);
+	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> RDB$STATISTICS = createField("RDB$STATISTICS", org.jooq.util.firebird.FirebirdDataType.getDefaultDataType("DOUBLE"), this);
 
 	public Rdb$indexSegments() {
 		super("RDB$INDEX_SEGMENTS");
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indices.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indices.java
deleted file mode 100644
index 40579c2cba..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$indices.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$indices extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 1932644040;
-
-	/**
-	 * The singleton instance of RDB$INDICES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$indices RDB$INDICES = new org.jooq.util.firebird.rdb.tables.Rdb$indices();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$INDEX_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$INDEX_NAME = createField("RDB$INDEX_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$RELATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$RELATION_NAME = createField("RDB$RELATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$INDEX_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$INDEX_ID = createField("RDB$INDEX_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$UNIQUE_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$UNIQUE_FLAG = createField("RDB$UNIQUE_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$SEGMENT_COUNT</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SEGMENT_COUNT = createField("RDB$SEGMENT_COUNT", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$INDEX_INACTIVE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$INDEX_INACTIVE = createField("RDB$INDEX_INACTIVE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$INDEX_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$INDEX_TYPE = createField("RDB$INDEX_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$FOREIGN_KEY</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FOREIGN_KEY = createField("RDB$FOREIGN_KEY", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$EXPRESSION_BLR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$EXPRESSION_BLR = createField("RDB$EXPRESSION_BLR", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$EXPRESSION_SOURCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$EXPRESSION_SOURCE = createField("RDB$EXPRESSION_SOURCE", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$INDICES.RDB$STATISTICS</code>
-	 * <p>
-	 * The SQL type of this item (DOUBLE   ) could not be mapped.<br/>
-	 * Deserialising this field might not work!
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Object> RDB$STATISTICS = createField("RDB$STATISTICS", org.jooq.util.firebird.FirebirdDataType.getDefaultDataType("DOUBLE   "), this);
-
-	public Rdb$indices() {
-		super("RDB$INDICES");
-	}
-
-	public Rdb$indices(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$indices.RDB$INDICES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$indices as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$indices(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$logFiles.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$logFiles.java
deleted file mode 100644
index 283455cfa2..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$logFiles.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$logFiles extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -267784181;
-
-	/**
-	 * The singleton instance of RDB$LOG_FILES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$logFiles RDB$LOG_FILES = new org.jooq.util.firebird.rdb.tables.Rdb$logFiles();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$LOG_FILES.RDB$FILE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FILE_NAME = createField("RDB$FILE_NAME", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	/**
-	 * The table column <code>RDB$LOG_FILES.RDB$FILE_SEQUENCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FILE_SEQUENCE = createField("RDB$FILE_SEQUENCE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$LOG_FILES.RDB$FILE_LENGTH</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$FILE_LENGTH = createField("RDB$FILE_LENGTH", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$LOG_FILES.RDB$FILE_PARTITIONS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FILE_PARTITIONS = createField("RDB$FILE_PARTITIONS", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$LOG_FILES.RDB$FILE_P_OFFSET</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$FILE_P_OFFSET = createField("RDB$FILE_P_OFFSET", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$LOG_FILES.RDB$FILE_FLAGS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FILE_FLAGS = createField("RDB$FILE_FLAGS", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$logFiles() {
-		super("RDB$LOG_FILES");
-	}
-
-	public Rdb$logFiles(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$logFiles.RDB$LOG_FILES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$logFiles as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$logFiles(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$pages.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$pages.java
deleted file mode 100644
index 41da9cfcd8..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$pages.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$pages extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -118977723;
-
-	/**
-	 * The singleton instance of RDB$PAGES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$pages RDB$PAGES = new org.jooq.util.firebird.rdb.tables.Rdb$pages();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$PAGES.RDB$PAGE_NUMBER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$PAGE_NUMBER = createField("RDB$PAGE_NUMBER", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$PAGES.RDB$RELATION_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$RELATION_ID = createField("RDB$RELATION_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PAGES.RDB$PAGE_SEQUENCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$PAGE_SEQUENCE = createField("RDB$PAGE_SEQUENCE", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$PAGES.RDB$PAGE_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PAGE_TYPE = createField("RDB$PAGE_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$pages() {
-		super("RDB$PAGES");
-	}
-
-	public Rdb$pages(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$pages.RDB$PAGES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$pages as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$pages(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$procedureParameters.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$procedureParameters.java
deleted file mode 100644
index d4867d87c1..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$procedureParameters.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$procedureParameters extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -1320047128;
-
-	/**
-	 * The singleton instance of RDB$PROCEDURE_PARAMETERS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters RDB$PROCEDURE_PARAMETERS = new org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$PARAMETER_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$PARAMETER_NAME = createField("RDB$PARAMETER_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$PROCEDURE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$PROCEDURE_NAME = createField("RDB$PROCEDURE_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$PARAMETER_NUMBER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PARAMETER_NUMBER = createField("RDB$PARAMETER_NUMBER", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$PARAMETER_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PARAMETER_TYPE = createField("RDB$PARAMETER_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$FIELD_SOURCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FIELD_SOURCE = createField("RDB$FIELD_SOURCE", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$DEFAULT_VALUE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DEFAULT_VALUE = createField("RDB$DEFAULT_VALUE", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$DEFAULT_SOURCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DEFAULT_SOURCE = createField("RDB$DEFAULT_SOURCE", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$COLLATION_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$COLLATION_ID = createField("RDB$COLLATION_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$NULL_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$NULL_FLAG = createField("RDB$NULL_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$PARAMETER_MECHANISM</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PARAMETER_MECHANISM = createField("RDB$PARAMETER_MECHANISM", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$FIELD_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FIELD_NAME = createField("RDB$FIELD_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURE_PARAMETERS.RDB$RELATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$RELATION_NAME = createField("RDB$RELATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	public Rdb$procedureParameters() {
-		super("RDB$PROCEDURE_PARAMETERS");
-	}
-
-	public Rdb$procedureParameters(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters.RDB$PROCEDURE_PARAMETERS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$procedureParameters(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$procedures.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$procedures.java
deleted file mode 100644
index 8a00a30593..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$procedures.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$procedures extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 1979622712;
-
-	/**
-	 * The singleton instance of RDB$PROCEDURES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$procedures RDB$PROCEDURES = new org.jooq.util.firebird.rdb.tables.Rdb$procedures();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$PROCEDURE_NAME = createField("RDB$PROCEDURE_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PROCEDURE_ID = createField("RDB$PROCEDURE_ID", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_INPUTS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PROCEDURE_INPUTS = createField("RDB$PROCEDURE_INPUTS", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_OUTPUTS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PROCEDURE_OUTPUTS = createField("RDB$PROCEDURE_OUTPUTS", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_SOURCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$PROCEDURE_SOURCE = createField("RDB$PROCEDURE_SOURCE", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_BLR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$PROCEDURE_BLR = createField("RDB$PROCEDURE_BLR", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$SECURITY_CLASS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$SECURITY_CLASS = createField("RDB$SECURITY_CLASS", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$OWNER_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$OWNER_NAME = createField("RDB$OWNER_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$RUNTIME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$RUNTIME = createField("RDB$RUNTIME", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$PROCEDURE_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$PROCEDURE_TYPE = createField("RDB$PROCEDURE_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$VALID_BLR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$VALID_BLR = createField("RDB$VALID_BLR", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$PROCEDURES.RDB$DEBUG_INFO</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DEBUG_INFO = createField("RDB$DEBUG_INFO", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$procedures() {
-		super("RDB$PROCEDURES");
-	}
-
-	public Rdb$procedures(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$procedures.RDB$PROCEDURES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$procedures as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$procedures(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$roles.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$roles.java
deleted file mode 100644
index a8e4995713..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$roles.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$roles extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 2011051149;
-
-	/**
-	 * The singleton instance of RDB$ROLES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$roles RDB$ROLES = new org.jooq.util.firebird.rdb.tables.Rdb$roles();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$ROLES.RDB$ROLE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$ROLE_NAME = createField("RDB$ROLE_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$ROLES.RDB$OWNER_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$OWNER_NAME = createField("RDB$OWNER_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$ROLES.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$ROLES.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$roles() {
-		super("RDB$ROLES");
-	}
-
-	public Rdb$roles(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$roles.RDB$ROLES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$roles as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$roles(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$securityClasses.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$securityClasses.java
deleted file mode 100644
index c87c3151e0..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$securityClasses.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$securityClasses extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -1765425010;
-
-	/**
-	 * The singleton instance of RDB$SECURITY_CLASSES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$securityClasses RDB$SECURITY_CLASSES = new org.jooq.util.firebird.rdb.tables.Rdb$securityClasses();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$SECURITY_CLASSES.RDB$SECURITY_CLASS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$SECURITY_CLASS = createField("RDB$SECURITY_CLASS", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$SECURITY_CLASSES.RDB$ACL</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$ACL = createField("RDB$ACL", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$SECURITY_CLASSES.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$securityClasses() {
-		super("RDB$SECURITY_CLASSES");
-	}
-
-	public Rdb$securityClasses(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$securityClasses.RDB$SECURITY_CLASSES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$securityClasses as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$securityClasses(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$transactions.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$transactions.java
deleted file mode 100644
index 5f18502e6a..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$transactions.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$transactions extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -1496534017;
-
-	/**
-	 * The singleton instance of RDB$TRANSACTIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$transactions RDB$TRANSACTIONS = new org.jooq.util.firebird.rdb.tables.Rdb$transactions();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$TRANSACTIONS.RDB$TRANSACTION_ID</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Integer> RDB$TRANSACTION_ID = createField("RDB$TRANSACTION_ID", org.jooq.impl.SQLDataType.INTEGER, this);
-
-	/**
-	 * The table column <code>RDB$TRANSACTIONS.RDB$TRANSACTION_STATE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$TRANSACTION_STATE = createField("RDB$TRANSACTION_STATE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRANSACTIONS.RDB$TIMESTAMP</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> RDB$TIMESTAMP = createField("RDB$TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP, this);
-
-	/**
-	 * The table column <code>RDB$TRANSACTIONS.RDB$TRANSACTION_DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$TRANSACTION_DESCRIPTION = createField("RDB$TRANSACTION_DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$transactions() {
-		super("RDB$TRANSACTIONS");
-	}
-
-	public Rdb$transactions(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$transactions.RDB$TRANSACTIONS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$transactions as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$transactions(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$triggerMessages.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$triggerMessages.java
deleted file mode 100644
index c18a88ec12..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$triggerMessages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$triggerMessages extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -2054815455;
-
-	/**
-	 * The singleton instance of RDB$TRIGGER_MESSAGES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages RDB$TRIGGER_MESSAGES = new org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$TRIGGER_MESSAGES.RDB$TRIGGER_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$TRIGGER_NAME = createField("RDB$TRIGGER_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGER_MESSAGES.RDB$MESSAGE_NUMBER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$MESSAGE_NUMBER = createField("RDB$MESSAGE_NUMBER", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGER_MESSAGES.RDB$MESSAGE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$MESSAGE = createField("RDB$MESSAGE", org.jooq.impl.SQLDataType.VARCHAR, this);
-
-	public Rdb$triggerMessages() {
-		super("RDB$TRIGGER_MESSAGES");
-	}
-
-	public Rdb$triggerMessages(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages.RDB$TRIGGER_MESSAGES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$triggerMessages(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$triggers.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$triggers.java
deleted file mode 100644
index 552b54c090..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$triggers.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$triggers extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 662763399;
-
-	/**
-	 * The singleton instance of RDB$TRIGGERS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$triggers RDB$TRIGGERS = new org.jooq.util.firebird.rdb.tables.Rdb$triggers();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$TRIGGER_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$TRIGGER_NAME = createField("RDB$TRIGGER_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$RELATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$RELATION_NAME = createField("RDB$RELATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$TRIGGER_SEQUENCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$TRIGGER_SEQUENCE = createField("RDB$TRIGGER_SEQUENCE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$TRIGGER_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$TRIGGER_TYPE = createField("RDB$TRIGGER_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$TRIGGER_SOURCE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$TRIGGER_SOURCE = createField("RDB$TRIGGER_SOURCE", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$TRIGGER_BLR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$TRIGGER_BLR = createField("RDB$TRIGGER_BLR", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$TRIGGER_INACTIVE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$TRIGGER_INACTIVE = createField("RDB$TRIGGER_INACTIVE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$FLAGS</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$FLAGS = createField("RDB$FLAGS", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$VALID_BLR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$VALID_BLR = createField("RDB$VALID_BLR", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TRIGGERS.RDB$DEBUG_INFO</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DEBUG_INFO = createField("RDB$DEBUG_INFO", org.jooq.impl.SQLDataType.BLOB, this);
-
-	public Rdb$triggers() {
-		super("RDB$TRIGGERS");
-	}
-
-	public Rdb$triggers(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$triggers.RDB$TRIGGERS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$triggers as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$triggers(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$types.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$types.java
deleted file mode 100644
index 2f647681e2..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$types.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$types extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = -218872429;
-
-	/**
-	 * The singleton instance of RDB$TYPES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$types RDB$TYPES = new org.jooq.util.firebird.rdb.tables.Rdb$types();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$TYPES.RDB$FIELD_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FIELD_NAME = createField("RDB$FIELD_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$TYPES.RDB$TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$TYPE = createField("RDB$TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$TYPES.RDB$TYPE_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$TYPE_NAME = createField("RDB$TYPE_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$TYPES.RDB$DESCRIPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, byte[]> RDB$DESCRIPTION = createField("RDB$DESCRIPTION", org.jooq.impl.SQLDataType.BLOB, this);
-
-	/**
-	 * The table column <code>RDB$TYPES.RDB$SYSTEM_FLAG</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$SYSTEM_FLAG = createField("RDB$SYSTEM_FLAG", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$types() {
-		super("RDB$TYPES");
-	}
-
-	public Rdb$types(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$types.RDB$TYPES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$types as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$types(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$userPrivileges.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$userPrivileges.java
deleted file mode 100644
index a4da968b6c..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$userPrivileges.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$userPrivileges extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 1724741803;
-
-	/**
-	 * The singleton instance of RDB$USER_PRIVILEGES
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges RDB$USER_PRIVILEGES = new org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$USER</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$USER = createField("RDB$USER", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$GRANTOR</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$GRANTOR = createField("RDB$GRANTOR", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$PRIVILEGE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$PRIVILEGE = createField("RDB$PRIVILEGE", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$GRANT_OPTION</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$GRANT_OPTION = createField("RDB$GRANT_OPTION", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$RELATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$RELATION_NAME = createField("RDB$RELATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$FIELD_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$FIELD_NAME = createField("RDB$FIELD_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$USER_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$USER_TYPE = createField("RDB$USER_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$USER_PRIVILEGES.RDB$OBJECT_TYPE</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$OBJECT_TYPE = createField("RDB$OBJECT_TYPE", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	public Rdb$userPrivileges() {
-		super("RDB$USER_PRIVILEGES");
-	}
-
-	public Rdb$userPrivileges(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges.RDB$USER_PRIVILEGES);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$userPrivileges(alias);
-	}
-}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$viewRelations.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$viewRelations.java
deleted file mode 100644
index 91a8e02b9d..0000000000
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/rdb/tables/Rdb$viewRelations.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * This class is generated by jOOQ
- */
-package org.jooq.util.firebird.rdb.tables;
-
-/**
- * This class is generated by jOOQ.
- */
-@javax.annotation.Generated(value    = {"http://www.jooq.org", "2.5.0"},
-                            comments = "This class is generated by jOOQ")
-public class Rdb$viewRelations extends org.jooq.impl.TableImpl<org.jooq.Record> {
-
-	private static final long serialVersionUID = 1747927361;
-
-	/**
-	 * The singleton instance of RDB$VIEW_RELATIONS
-	 */
-	public static final org.jooq.util.firebird.rdb.tables.Rdb$viewRelations RDB$VIEW_RELATIONS = new org.jooq.util.firebird.rdb.tables.Rdb$viewRelations();
-
-	/**
-	 * The class holding records for this type
-	 */
-	@Override
-	public java.lang.Class<org.jooq.Record> getRecordType() {
-		return org.jooq.Record.class;
-	}
-
-	/**
-	 * The table column <code>RDB$VIEW_RELATIONS.RDB$VIEW_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$VIEW_NAME = createField("RDB$VIEW_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$VIEW_RELATIONS.RDB$RELATION_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$RELATION_NAME = createField("RDB$RELATION_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	/**
-	 * The table column <code>RDB$VIEW_RELATIONS.RDB$VIEW_CONTEXT</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.Short> RDB$VIEW_CONTEXT = createField("RDB$VIEW_CONTEXT", org.jooq.impl.SQLDataType.SMALLINT, this);
-
-	/**
-	 * The table column <code>RDB$VIEW_RELATIONS.RDB$CONTEXT_NAME</code>
-	 */
-	public final org.jooq.TableField<org.jooq.Record, java.lang.String> RDB$CONTEXT_NAME = createField("RDB$CONTEXT_NAME", org.jooq.impl.SQLDataType.CHAR, this);
-
-	public Rdb$viewRelations() {
-		super("RDB$VIEW_RELATIONS");
-	}
-
-	public Rdb$viewRelations(java.lang.String alias) {
-		super(alias, null, org.jooq.util.firebird.rdb.tables.Rdb$viewRelations.RDB$VIEW_RELATIONS);
-	}
-
-	@Override
-	public org.jooq.util.firebird.rdb.tables.Rdb$viewRelations as(java.lang.String alias) {
-		return new org.jooq.util.firebird.rdb.tables.Rdb$viewRelations(alias);
-	}
-}
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/rdb.properties b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/rdb.properties
index 0a653f5740..b267f52748 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/rdb.properties
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/rdb.properties
@@ -6,7 +6,7 @@ jdbc.Password=TEST
 
 generator=org.jooq.util.DefaultGenerator
 generator.database=org.jooq.util.firebird.FirebirdDatabase
-generator.database.includes=RDB$RELATIONS,RDB$RELATION_FIELDS,RDB$FIELDS,RDB$CHARACTER_SETS,RDB$RELATION_CONSTRAINTS,RDB$REF_CONSTRAINTS,RDB$DEPENDENCIES,RDB$INDEX_SEGMENTS
+generator.database.includes=RDB\\$RELATIONS,RDB\\$RELATION_FIELDS,RDB\\$FIELDS,RDB\\$CHARACTER_SETS,RDB\\$RELATION_CONSTRAINTS,RDB\\$REF_CONSTRAINTS,RDB\\$DEPENDENCIES,RDB\\$INDEX_SEGMENTS
 generator.database.excludes=
 generator.generate.deprecated=false
 generator.generate.fields=both
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
index bb97749911..3411c60e22 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
@@ -254,6 +254,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
                 case CUBRID:
                 case DB2:
                 case DERBY:
+                case FIREBIRD:
                 case H2:
                 case HSQLDB:
                 case INGRES: