From 643d14acc1b530ec9fcd0352973d23d07c9b7b38 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 6 Jan 2014 10:52:41 +0100 Subject: [PATCH] [#2926] Add code-generation support for the MySQL / MariaDB TINYTEXT data type --- jOOQ-test/src/org/jooq/test/mariadb/create.sql | 9 +++++++++ jOOQ-test/src/org/jooq/test/mysql/create.sql | 9 +++++++++ .../main/java/org/jooq/util/mariadb/MariaDBDataType.java | 1 + .../src/main/java/org/jooq/util/mysql/MySQLDataType.java | 1 + 4 files changed, 20 insertions(+) diff --git a/jOOQ-test/src/org/jooq/test/mariadb/create.sql b/jOOQ-test/src/org/jooq/test/mariadb/create.sql index 5773139588..416ac45879 100644 --- a/jOOQ-test/src/org/jooq/test/mariadb/create.sql +++ b/jOOQ-test/src/org/jooq/test/mariadb/create.sql @@ -46,6 +46,15 @@ DROP TABLE IF EXISTS t_unsigned/ DROP TABLE IF EXISTS t_959/ DROP TABLE IF EXISTS t_booleans/ DROP TABLE IF EXISTS t_identity_pk/ +DROP TABLE IF EXISTS t_2926/ + +CREATE TABLE t_2926 ( + t1 TINYTEXT, + t2 TEXT, + t3 MEDIUMTEXT, + t4 LONGTEXT +) +/ CREATE TABLE t_identity_pk ( id INT NOT NULL AUTO_INCREMENT, diff --git a/jOOQ-test/src/org/jooq/test/mysql/create.sql b/jOOQ-test/src/org/jooq/test/mysql/create.sql index 5773139588..416ac45879 100644 --- a/jOOQ-test/src/org/jooq/test/mysql/create.sql +++ b/jOOQ-test/src/org/jooq/test/mysql/create.sql @@ -46,6 +46,15 @@ DROP TABLE IF EXISTS t_unsigned/ DROP TABLE IF EXISTS t_959/ DROP TABLE IF EXISTS t_booleans/ DROP TABLE IF EXISTS t_identity_pk/ +DROP TABLE IF EXISTS t_2926/ + +CREATE TABLE t_2926 ( + t1 TINYTEXT, + t2 TEXT, + t3 MEDIUMTEXT, + t4 LONGTEXT +) +/ CREATE TABLE t_identity_pk ( id INT NOT NULL AUTO_INCREMENT, diff --git a/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java b/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java index 7f4e358c93..410a69aae5 100644 --- a/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java @@ -124,6 +124,7 @@ public class MariaDBDataType { // Dialect-specific data types and synonyms thereof // ------------------------------------------------------------------------- + public static final DataType TINYTEXT = new DefaultDataType(SQLDialect.MARIADB, SQLDataType.CLOB, "tinytext", "char"); public static final DataType MEDIUMTEXT = new DefaultDataType(SQLDialect.MARIADB, SQLDataType.CLOB, "mediumtext", "char"); public static final DataType LONGTEXT = new DefaultDataType(SQLDialect.MARIADB, SQLDataType.CLOB, "longtext", "char"); public static final DataType ENUM = new DefaultDataType(SQLDialect.MARIADB, SQLDataType.VARCHAR, "enum", "char"); diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java index 2b8f8eb8fc..5bcab1fb81 100644 --- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java @@ -124,6 +124,7 @@ public class MySQLDataType { // Dialect-specific data types and synonyms thereof // ------------------------------------------------------------------------- + public static final DataType TINYTEXT = new DefaultDataType(SQLDialect.MYSQL, SQLDataType.CLOB, "tinytext", "char"); public static final DataType MEDIUMTEXT = new DefaultDataType(SQLDialect.MYSQL, SQLDataType.CLOB, "mediumtext", "char"); public static final DataType LONGTEXT = new DefaultDataType(SQLDialect.MYSQL, SQLDataType.CLOB, "longtext", "char"); public static final DataType ENUM = new DefaultDataType(SQLDialect.MYSQL, SQLDataType.VARCHAR, "enum", "char");