diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java index 04a2af0ef5..d8ac69af39 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Mysql.java @@ -6,12 +6,12 @@ package org.jooq.util.mysql.mysql; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Mysql extends org.jooq.impl.SchemaImpl { - private static final long serialVersionUID = -1816401397; + private static final long serialVersionUID = -490480462; /** * The singleton instance of mysql @@ -27,6 +27,12 @@ public class Mysql extends org.jooq.impl.SchemaImpl { @Override public final java.util.List> getTables() { + java.util.List result = new java.util.ArrayList(); + result.addAll(getTables0()); + return result; + } + + private final java.util.List> getTables0() { return java.util.Arrays.>asList( org.jooq.util.mysql.mysql.tables.Proc.PROC, org.jooq.util.mysql.mysql.tables.ProcsPriv.PROCS_PRIV); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java index cc48f43ec8..e56e81ba7c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/Tables.java @@ -8,10 +8,10 @@ package org.jooq.util.mysql.mysql; * * Convenience access to all tables in mysql */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") -public final class Tables { +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Tables { /** * Stored Procedures @@ -22,9 +22,4 @@ public final class Tables { * Procedure privileges */ public static final org.jooq.util.mysql.mysql.tables.ProcsPriv PROCS_PRIV = org.jooq.util.mysql.mysql.tables.ProcsPriv.PROCS_PRIV; - - /** - * No further instances allowed - */ - private Tables() {} } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java index 249b624ee2..ba6c23512c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcIsDeterministic.java @@ -6,9 +6,9 @@ package org.jooq.util.mysql.mysql.enums; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public enum ProcIsDeterministic implements org.jooq.EnumType { YES("YES"), @@ -23,6 +23,14 @@ public enum ProcIsDeterministic implements org.jooq.EnumType { this.literal = literal; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Schema getSchema() { + return null; + } + /** * {@inheritDoc} */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java index 0fbe390f25..e54826aca0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcLanguage.java @@ -6,9 +6,9 @@ package org.jooq.util.mysql.mysql.enums; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public enum ProcLanguage implements org.jooq.EnumType { SQL("SQL"), @@ -21,6 +21,14 @@ public enum ProcLanguage implements org.jooq.EnumType { this.literal = literal; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Schema getSchema() { + return null; + } + /** * {@inheritDoc} */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java index 9f68db0912..f64a24b1bd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSecurityType.java @@ -6,9 +6,9 @@ package org.jooq.util.mysql.mysql.enums; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public enum ProcSecurityType implements org.jooq.EnumType { INVOKER("INVOKER"), @@ -23,6 +23,14 @@ public enum ProcSecurityType implements org.jooq.EnumType { this.literal = literal; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Schema getSchema() { + return null; + } + /** * {@inheritDoc} */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java index d1f81e4762..7359cc1e64 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcSqlDataAccess.java @@ -6,9 +6,9 @@ package org.jooq.util.mysql.mysql.enums; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public enum ProcSqlDataAccess implements org.jooq.EnumType { CONTAINS_SQL("CONTAINS_SQL"), @@ -27,6 +27,14 @@ public enum ProcSqlDataAccess implements org.jooq.EnumType { this.literal = literal; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Schema getSchema() { + return null; + } + /** * {@inheritDoc} */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java index 468401b895..915b0f9515 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcType.java @@ -6,9 +6,9 @@ package org.jooq.util.mysql.mysql.enums; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public enum ProcType implements org.jooq.EnumType { FUNCTION("FUNCTION"), @@ -23,6 +23,14 @@ public enum ProcType implements org.jooq.EnumType { this.literal = literal; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Schema getSchema() { + return null; + } + /** * {@inheritDoc} */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java index 1fb5985efa..dff70bcd62 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/enums/ProcsPrivRoutineType.java @@ -6,9 +6,9 @@ package org.jooq.util.mysql.mysql.enums; /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public enum ProcsPrivRoutineType implements org.jooq.EnumType { FUNCTION("FUNCTION"), @@ -23,6 +23,14 @@ public enum ProcsPrivRoutineType implements org.jooq.EnumType { this.literal = literal; } + /** + * {@inheritDoc} + */ + @Override + public org.jooq.Schema getSchema() { + return null; + } + /** * {@inheritDoc} */ diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java index 2d90a00106..afb5985955 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/Proc.java @@ -8,12 +8,12 @@ package org.jooq.util.mysql.mysql.tables; * * Stored Procedures */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Proc extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = 1769183481; + private static final long serialVersionUID = -1196832187; /** * The singleton instance of mysql.proc @@ -31,12 +31,12 @@ public class Proc extends org.jooq.impl.TableImpl { /** * The column mysql.proc.db. */ - public static final org.jooq.TableField DB = createField("db", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField DB = createField("db", org.jooq.impl.SQLDataType.CHAR.length(64), PROC); /** * The column mysql.proc.name. */ - public static final org.jooq.TableField NAME = createField("name", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField NAME = createField("name", org.jooq.impl.SQLDataType.CHAR.length(64), PROC); /** * The column mysql.proc.type. @@ -46,7 +46,7 @@ public class Proc extends org.jooq.impl.TableImpl { /** * The column mysql.proc.specific_name. */ - public static final org.jooq.TableField SPECIFIC_NAME = createField("specific_name", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField SPECIFIC_NAME = createField("specific_name", org.jooq.impl.SQLDataType.CHAR.length(64), PROC); /** * The column mysql.proc.language. @@ -71,7 +71,7 @@ public class Proc extends org.jooq.impl.TableImpl { /** * The column mysql.proc.param_list. */ - public static final org.jooq.TableField PARAM_LIST = createField("param_list", org.jooq.impl.SQLDataType.BLOB, PROC); + public static final org.jooq.TableField PARAM_LIST = createField("param_list", org.jooq.impl.SQLDataType.BLOB.length(65535), PROC); /** * The column mysql.proc.returns. @@ -86,7 +86,7 @@ public class Proc extends org.jooq.impl.TableImpl { /** * The column mysql.proc.definer. */ - public static final org.jooq.TableField DEFINER = createField("definer", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField DEFINER = createField("definer", org.jooq.impl.SQLDataType.CHAR.length(77), PROC); /** * The column mysql.proc.created. @@ -101,27 +101,27 @@ public class Proc extends org.jooq.impl.TableImpl { /** * The column mysql.proc.sql_mode. */ - public static final org.jooq.TableField SQL_MODE = createField("sql_mode", org.jooq.impl.SQLDataType.VARCHAR, PROC); + public static final org.jooq.TableField SQL_MODE = createField("sql_mode", org.jooq.impl.SQLDataType.VARCHAR.length(478), PROC); /** * The column mysql.proc.comment. */ - public static final org.jooq.TableField COMMENT = createField("comment", org.jooq.impl.SQLDataType.CLOB, PROC); + public static final org.jooq.TableField COMMENT = createField("comment", org.jooq.impl.SQLDataType.CLOB.length(65535), PROC); /** * The column mysql.proc.character_set_client. */ - public static final org.jooq.TableField CHARACTER_SET_CLIENT = createField("character_set_client", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField CHARACTER_SET_CLIENT = createField("character_set_client", org.jooq.impl.SQLDataType.CHAR.length(32), PROC); /** * The column mysql.proc.collation_connection. */ - public static final org.jooq.TableField COLLATION_CONNECTION = createField("collation_connection", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField COLLATION_CONNECTION = createField("collation_connection", org.jooq.impl.SQLDataType.CHAR.length(32), PROC); /** * The column mysql.proc.db_collation. */ - public static final org.jooq.TableField DB_COLLATION = createField("db_collation", org.jooq.impl.SQLDataType.CHAR, PROC); + public static final org.jooq.TableField DB_COLLATION = createField("db_collation", org.jooq.impl.SQLDataType.CHAR.length(32), PROC); /** * The column mysql.proc.body_utf8. diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java index 3c505da03b..a83c98d787 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/tables/ProcsPriv.java @@ -8,12 +8,12 @@ package org.jooq.util.mysql.mysql.tables; * * Procedure privileges */ -@javax.annotation.Generated(value = {"http://www.jooq.org", "3.0.0"}, +@javax.annotation.Generated(value = { "http://www.jooq.org", "3.1.0" }, comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings("all") +@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ProcsPriv extends org.jooq.impl.TableImpl { - private static final long serialVersionUID = -272562709; + private static final long serialVersionUID = -1915884789; /** * The singleton instance of mysql.procs_priv @@ -31,22 +31,22 @@ public class ProcsPriv extends org.jooq.impl.TableImpl { /** * The column mysql.procs_priv.Host. */ - public static final org.jooq.TableField HOST = createField("Host", org.jooq.impl.SQLDataType.CHAR, PROCS_PRIV); + public static final org.jooq.TableField HOST = createField("Host", org.jooq.impl.SQLDataType.CHAR.length(60), PROCS_PRIV); /** * The column mysql.procs_priv.Db. */ - public static final org.jooq.TableField DB = createField("Db", org.jooq.impl.SQLDataType.CHAR, PROCS_PRIV); + public static final org.jooq.TableField DB = createField("Db", org.jooq.impl.SQLDataType.CHAR.length(64), PROCS_PRIV); /** * The column mysql.procs_priv.User. */ - public static final org.jooq.TableField USER = createField("User", org.jooq.impl.SQLDataType.CHAR, PROCS_PRIV); + public static final org.jooq.TableField USER = createField("User", org.jooq.impl.SQLDataType.CHAR.length(16), PROCS_PRIV); /** * The column mysql.procs_priv.Routine_name. */ - public static final org.jooq.TableField ROUTINE_NAME = createField("Routine_name", org.jooq.impl.SQLDataType.CHAR, PROCS_PRIV); + public static final org.jooq.TableField ROUTINE_NAME = createField("Routine_name", org.jooq.impl.SQLDataType.CHAR.length(64), PROCS_PRIV); /** * The column mysql.procs_priv.Routine_type. @@ -56,12 +56,12 @@ public class ProcsPriv extends org.jooq.impl.TableImpl { /** * The column mysql.procs_priv.Grantor. */ - public static final org.jooq.TableField GRANTOR = createField("Grantor", org.jooq.impl.SQLDataType.CHAR, PROCS_PRIV); + public static final org.jooq.TableField GRANTOR = createField("Grantor", org.jooq.impl.SQLDataType.CHAR.length(77), PROCS_PRIV); /** * The column mysql.procs_priv.Proc_priv. */ - public static final org.jooq.TableField PROC_PRIV = createField("Proc_priv", org.jooq.impl.SQLDataType.VARCHAR, PROCS_PRIV); + public static final org.jooq.TableField PROC_PRIV = createField("Proc_priv", org.jooq.impl.SQLDataType.VARCHAR.length(27), PROCS_PRIV); /** * The column mysql.procs_priv.Timestamp.