From 668d9dd731d3dd044a002370bcd6558f906a839e Mon Sep 17 00:00:00 2001 From: lukaseder Date: Wed, 27 Jul 2016 16:39:33 +0200 Subject: [PATCH] [#5467] Fixed regression and re-generated jOOQ-meta --- .../java/org/jooq/util/JavaGenerator.java | 20 +- .../jooq/util/mysql/mysql/DefaultCatalog.java | 60 +++++ .../java/org/jooq/util/mysql/mysql/Mysql.java | 90 +++++-- .../org/jooq/util/mysql/mysql/Tables.java | 36 ++- .../mysql/enums/ProcIsDeterministic.java | 83 +++--- .../util/mysql/mysql/enums/ProcLanguage.java | 81 +++--- .../mysql/mysql/enums/ProcSecurityType.java | 83 +++--- .../mysql/mysql/enums/ProcSqlDataAccess.java | 87 +++--- .../jooq/util/mysql/mysql/enums/ProcType.java | 83 +++--- .../mysql/enums/ProcsPrivRoutineType.java | 83 +++--- .../jooq/util/mysql/mysql/tables/Proc.java | 250 ++++++++++-------- .../util/mysql/mysql/tables/ProcsPriv.java | 150 ++++++----- 12 files changed, 706 insertions(+), 400 deletions(-) create mode 100644 jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/DefaultCatalog.java diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java index af1d7775b8..efb0f1ef48 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -1890,6 +1890,7 @@ public class JavaGenerator extends AbstractGenerator { printClassAnnotations(out, e.getSchema()); + boolean enumHasNoSchema = e.isSynthetic() || !(e.getDatabase() instanceof PostgresDatabase); if (scala) { out.println("object %s {", className); out.println(); @@ -1923,10 +1924,15 @@ public class JavaGenerator extends AbstractGenerator { out.println(); out.println("sealed trait %s extends %s[[before= with ][%s]] {", className, EnumType.class, interfaces); + if (enumHasNoSchema) + out.tab(1).println("override def getCatalog : %s = null", Catalog.class); + else + out.tab(1).println("override def getCatalog : %s = if (getSchema == null) null else getSchema().getCatalog()", Catalog.class); + // [#2135] Only the PostgreSQL database supports schema-scoped enum types out.tab(1).println("override def getSchema : %s = %s", Schema.class, - (e.isSynthetic() || !(e.getDatabase() instanceof PostgresDatabase)) + enumHasNoSchema ? "null" : out.ref(getStrategy().getFullJavaIdentifier(e.getSchema()), 2)); out.tab(1).println("override def getName : %s = %s", @@ -1961,11 +1967,21 @@ public class JavaGenerator extends AbstractGenerator { out.tab(2).println("this.literal = literal;"); out.tab(1).println("}"); + out.tab(1).overrideInherit(); + out.tab(1).println("public %s getCatalog() {", Catalog.class); + + if (enumHasNoSchema) + out.tab(2).println("return null;"); + else + out.tab(2).println("return getSchema() == null ? null : getSchema().getCatalog();"); + + out.tab(1).println("}"); + // [#2135] Only the PostgreSQL database supports schema-scoped enum types out.tab(1).overrideInherit(); out.tab(1).println("public %s getSchema() {", Schema.class); out.tab(2).println("return %s;", - (e.isSynthetic() || !(e.getDatabase() instanceof PostgresDatabase)) + enumHasNoSchema ? "null" : out.ref(getStrategy().getFullJavaIdentifier(e.getSchema()), 2)); out.tab(1).println("}"); diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/DefaultCatalog.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/DefaultCatalog.java new file mode 100644 index 0000000000..c9c82eac02 --- /dev/null +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/mysql/DefaultCatalog.java @@ -0,0 +1,60 @@ +/** + * This class is generated by jOOQ + */ +package org.jooq.util.mysql.mysql; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Generated; + +import org.jooq.Schema; +import org.jooq.impl.CatalogImpl; + + +/** + * This class is generated by jOOQ. + */ +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DefaultCatalog extends CatalogImpl { + + private static final long serialVersionUID = -178598874; + + /** + * The reference instance of + */ + public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); + + /** + * The schema mysql. + */ + public final Mysql MYSQL = org.jooq.util.mysql.mysql.Mysql.MYSQL; + + /** + * No further instances allowed + */ + private DefaultCatalog() { + super(""); + } + + @Override + public final List getSchemas() { + List result = new ArrayList(); + result.addAll(getSchemas0()); + return result; + } + + private final List getSchemas0() { + return Arrays.asList( + Mysql.MYSQL); + } +} 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 9c82513c55..ea3db7edaa 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 @@ -3,38 +3,76 @@ */ package org.jooq.util.mysql.mysql; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.Table; +import org.jooq.impl.SchemaImpl; +import org.jooq.util.mysql.mysql.tables.Proc; +import org.jooq.util.mysql.mysql.tables.ProcsPriv; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Mysql extends org.jooq.impl.SchemaImpl { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Mysql extends SchemaImpl { - private static final long serialVersionUID = -1932444209; + private static final long serialVersionUID = 1140106601; - /** - * The singleton instance of mysql - */ - public static final Mysql MYSQL = new Mysql(); + /** + * The reference instance of mysql + */ + public static final Mysql MYSQL = new Mysql(); - /** - * No further instances allowed - */ - private Mysql() { - super("mysql"); - } + /** + * Stored Procedures + */ + public final Proc PROC = org.jooq.util.mysql.mysql.tables.Proc.PROC; - @Override - public final java.util.List> getTables() { - java.util.List result = new java.util.ArrayList(); - result.addAll(getTables0()); - return result; - } + /** + * Procedure privileges + */ + public final ProcsPriv PROCS_PRIV = org.jooq.util.mysql.mysql.tables.ProcsPriv.PROCS_PRIV; - 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); - } + /** + * No further instances allowed + */ + private Mysql() { + super("mysql", null); + } + + + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return DefaultCatalog.DEFAULT_CATALOG; + } + + @Override + public final List> getTables() { + List result = new ArrayList(); + result.addAll(getTables0()); + return result; + } + + private final List> getTables0() { + return Arrays.>asList( + Proc.PROC, + 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 bc2bbf4636..e7effd35dc 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 @@ -3,23 +3,33 @@ */ package org.jooq.util.mysql.mysql; + +import javax.annotation.Generated; + +import org.jooq.util.mysql.mysql.tables.Proc; +import org.jooq.util.mysql.mysql.tables.ProcsPriv; + + /** - * This class is generated by jOOQ. - * * Convenience access to all tables in mysql */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { - /** - * Stored Procedures - */ - public static final org.jooq.util.mysql.mysql.tables.Proc PROC = org.jooq.util.mysql.mysql.tables.Proc.PROC; + /** + * Stored Procedures + */ + public static final Proc PROC = org.jooq.util.mysql.mysql.tables.Proc.PROC; - /** - * Procedure privileges - */ - public static final org.jooq.util.mysql.mysql.tables.ProcsPriv PROCS_PRIV = org.jooq.util.mysql.mysql.tables.ProcsPriv.PROCS_PRIV; + /** + * Procedure privileges + */ + public static final ProcsPriv PROCS_PRIV = org.jooq.util.mysql.mysql.tables.ProcsPriv.PROCS_PRIV; } 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 fd8ed2c172..63d9586b23 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 @@ -3,45 +3,66 @@ */ package org.jooq.util.mysql.mysql.enums; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum ProcIsDeterministic implements org.jooq.EnumType { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum ProcIsDeterministic implements EnumType { - YES("YES"), + YES("YES"), - NO("NO"); + NO("NO"); - private final java.lang.String literal; + private final String literal; - private ProcIsDeterministic(java.lang.String literal) { - this.literal = literal; - } + private ProcIsDeterministic(String literal) { + this.literal = literal; + } - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Schema getSchema() { - return null; - } + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getName() { - return "proc_is_deterministic"; - } + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getLiteral() { - return literal; - } + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "proc_is_deterministic"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getLiteral() { + return literal; + } } 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 ea532ca456..21b0708eba 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 @@ -3,43 +3,64 @@ */ package org.jooq.util.mysql.mysql.enums; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum ProcLanguage implements org.jooq.EnumType { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum ProcLanguage implements EnumType { - SQL("SQL"); + SQL("SQL"); - private final java.lang.String literal; + private final String literal; - private ProcLanguage(java.lang.String literal) { - this.literal = literal; - } + private ProcLanguage(String literal) { + this.literal = literal; + } - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Schema getSchema() { - return null; - } + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getName() { - return "proc_language"; - } + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getLiteral() { - return literal; - } + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "proc_language"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getLiteral() { + return literal; + } } 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 6c5396ec6b..1b8500cabb 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 @@ -3,45 +3,66 @@ */ package org.jooq.util.mysql.mysql.enums; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum ProcSecurityType implements org.jooq.EnumType { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum ProcSecurityType implements EnumType { - INVOKER("INVOKER"), + INVOKER("INVOKER"), - DEFINER("DEFINER"); + DEFINER("DEFINER"); - private final java.lang.String literal; + private final String literal; - private ProcSecurityType(java.lang.String literal) { - this.literal = literal; - } + private ProcSecurityType(String literal) { + this.literal = literal; + } - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Schema getSchema() { - return null; - } + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getName() { - return "proc_security_type"; - } + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getLiteral() { - return literal; - } + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "proc_security_type"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getLiteral() { + return literal; + } } 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 5a70b3b167..4c84ea022b 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 @@ -3,49 +3,70 @@ */ package org.jooq.util.mysql.mysql.enums; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum ProcSqlDataAccess implements org.jooq.EnumType { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum ProcSqlDataAccess implements EnumType { - CONTAINS_SQL("CONTAINS_SQL"), + CONTAINS_SQL("CONTAINS_SQL"), - NO_SQL("NO_SQL"), + NO_SQL("NO_SQL"), - READS_SQL_DATA("READS_SQL_DATA"), + READS_SQL_DATA("READS_SQL_DATA"), - MODIFIES_SQL_DATA("MODIFIES_SQL_DATA"); + MODIFIES_SQL_DATA("MODIFIES_SQL_DATA"); - private final java.lang.String literal; + private final String literal; - private ProcSqlDataAccess(java.lang.String literal) { - this.literal = literal; - } + private ProcSqlDataAccess(String literal) { + this.literal = literal; + } - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Schema getSchema() { - return null; - } + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getName() { - return "proc_sql_data_access"; - } + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getLiteral() { - return literal; - } + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "proc_sql_data_access"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getLiteral() { + return literal; + } } 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 aceef96f2a..79dc58f5c3 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 @@ -3,45 +3,66 @@ */ package org.jooq.util.mysql.mysql.enums; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum ProcType implements org.jooq.EnumType { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum ProcType implements EnumType { - FUNCTION("FUNCTION"), + FUNCTION("FUNCTION"), - PROCEDURE("PROCEDURE"); + PROCEDURE("PROCEDURE"); - private final java.lang.String literal; + private final String literal; - private ProcType(java.lang.String literal) { - this.literal = literal; - } + private ProcType(String literal) { + this.literal = literal; + } - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Schema getSchema() { - return null; - } + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getName() { - return "proc_type"; - } + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getLiteral() { - return literal; - } + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "proc_type"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getLiteral() { + return literal; + } } 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 ffc5f00677..aaff6e8a32 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 @@ -3,45 +3,66 @@ */ package org.jooq.util.mysql.mysql.enums; + +import javax.annotation.Generated; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + /** * This class is generated by jOOQ. */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum ProcsPrivRoutineType implements org.jooq.EnumType { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum ProcsPrivRoutineType implements EnumType { - FUNCTION("FUNCTION"), + FUNCTION("FUNCTION"), - PROCEDURE("PROCEDURE"); + PROCEDURE("PROCEDURE"); - private final java.lang.String literal; + private final String literal; - private ProcsPrivRoutineType(java.lang.String literal) { - this.literal = literal; - } + private ProcsPrivRoutineType(String literal) { + this.literal = literal; + } - /** - * {@inheritDoc} - */ - @Override - public org.jooq.Schema getSchema() { - return null; - } + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getName() { - return "procs_priv_Routine_type"; - } + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return null; + } - /** - * {@inheritDoc} - */ - @Override - public java.lang.String getLiteral() { - return literal; - } + /** + * {@inheritDoc} + */ + @Override + public String getName() { + return "procs_priv_Routine_type"; + } + + /** + * {@inheritDoc} + */ + @Override + public String getLiteral() { + return literal; + } } 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 d8ecba4969..4d8048658f 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 @@ -3,143 +3,173 @@ */ package org.jooq.util.mysql.mysql.tables; + +import java.sql.Timestamp; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.TableImpl; +import org.jooq.util.mysql.mysql.Mysql; +import org.jooq.util.mysql.mysql.enums.ProcIsDeterministic; +import org.jooq.util.mysql.mysql.enums.ProcLanguage; +import org.jooq.util.mysql.mysql.enums.ProcSecurityType; +import org.jooq.util.mysql.mysql.enums.ProcSqlDataAccess; +import org.jooq.util.mysql.mysql.enums.ProcType; + + /** - * This class is generated by jOOQ. - * * Stored Procedures */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class Proc extends org.jooq.impl.TableImpl { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Proc extends TableImpl { - private static final long serialVersionUID = 1513690807; + private static final long serialVersionUID = -765641597; - /** - * The singleton instance of mysql.proc - */ - public static final org.jooq.util.mysql.mysql.tables.Proc PROC = new org.jooq.util.mysql.mysql.tables.Proc(); + /** + * The reference instance of mysql.proc + */ + public static final Proc PROC = new Proc(); - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return org.jooq.Record.class; - } + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } - /** - * The column mysql.proc.db. - */ - public static final org.jooq.TableField DB = createField("db", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.db. + */ + public static final TableField DB = createField("db", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROC, ""); - /** - * The column mysql.proc.name. - */ - public static final org.jooq.TableField NAME = createField("name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.name. + */ + public static final TableField NAME = createField("name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROC, ""); - /** - * The column mysql.proc.type. - */ - public static final org.jooq.TableField TYPE = createField("type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcType.class), PROC, ""); + /** + * The column mysql.proc.type. + */ + public static final TableField TYPE = createField("type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcType.class), PROC, ""); - /** - * The column mysql.proc.specific_name. - */ - public static final org.jooq.TableField SPECIFIC_NAME = createField("specific_name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.specific_name. + */ + public static final TableField SPECIFIC_NAME = createField("specific_name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROC, ""); - /** - * The column mysql.proc.language. - */ - public static final org.jooq.TableField LANGUAGE = createField("language", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcLanguage.class), PROC, ""); + /** + * The column mysql.proc.language. + */ + public static final TableField LANGUAGE = createField("language", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcLanguage.class), PROC, ""); - /** - * The column mysql.proc.sql_data_access. - */ - public static final org.jooq.TableField SQL_DATA_ACCESS = createField("sql_data_access", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcSqlDataAccess.class), PROC, ""); + /** + * The column mysql.proc.sql_data_access. + */ + public static final TableField SQL_DATA_ACCESS = createField("sql_data_access", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcSqlDataAccess.class), PROC, ""); - /** - * The column mysql.proc.is_deterministic. - */ - public static final org.jooq.TableField IS_DETERMINISTIC = createField("is_deterministic", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcIsDeterministic.class), PROC, ""); + /** + * The column mysql.proc.is_deterministic. + */ + public static final TableField IS_DETERMINISTIC = createField("is_deterministic", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcIsDeterministic.class), PROC, ""); - /** - * The column mysql.proc.security_type. - */ - public static final org.jooq.TableField SECURITY_TYPE = createField("security_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcSecurityType.class), PROC, ""); + /** + * The column mysql.proc.security_type. + */ + public static final TableField SECURITY_TYPE = createField("security_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcSecurityType.class), PROC, ""); - /** - * The column mysql.proc.param_list. - */ - public static final org.jooq.TableField PARAM_LIST = createField("param_list", org.jooq.impl.SQLDataType.BLOB.length(65535).nullable(false), PROC, ""); + /** + * The column mysql.proc.param_list. + */ + public static final TableField PARAM_LIST = createField("param_list", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, ""); - /** - * The column mysql.proc.returns. - */ - public static final org.jooq.TableField RETURNS = createField("returns", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, ""); + /** + * The column mysql.proc.returns. + */ + public static final TableField RETURNS = createField("returns", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, ""); - /** - * The column mysql.proc.body. - */ - public static final org.jooq.TableField BODY = createField("body", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, ""); + /** + * The column mysql.proc.body. + */ + public static final TableField BODY = createField("body", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, ""); - /** - * The column mysql.proc.definer. - */ - public static final org.jooq.TableField DEFINER = createField("definer", org.jooq.impl.SQLDataType.CHAR.length(77).nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.definer. + */ + public static final TableField DEFINER = createField("definer", org.jooq.impl.SQLDataType.CHAR.length(77).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROC, ""); - /** - * The column mysql.proc.created. - */ - public static final org.jooq.TableField CREATED = createField("created", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.created. + */ + public static final TableField CREATED = createField("created", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.inline("CURRENT_TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP)), PROC, ""); - /** - * The column mysql.proc.modified. - */ - public static final org.jooq.TableField MODIFIED = createField("modified", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.modified. + */ + public static final TableField MODIFIED = createField("modified", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.inline("0000-00-00 00:00:00", org.jooq.impl.SQLDataType.TIMESTAMP)), PROC, ""); - /** - * The column mysql.proc.sql_mode. - */ - public static final org.jooq.TableField SQL_MODE = createField("sql_mode", org.jooq.impl.SQLDataType.VARCHAR.length(478).nullable(false).defaulted(true), PROC, ""); + /** + * The column mysql.proc.sql_mode. + */ + public static final TableField SQL_MODE = createField("sql_mode", org.jooq.impl.SQLDataType.VARCHAR.length(478).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), PROC, ""); - /** - * The column mysql.proc.comment. - */ - public static final org.jooq.TableField COMMENT = createField("comment", org.jooq.impl.SQLDataType.CLOB.length(65535).nullable(false), PROC, ""); + /** + * The column mysql.proc.comment. + */ + public static final TableField COMMENT = createField("comment", org.jooq.impl.SQLDataType.CLOB.nullable(false), 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.length(32), PROC, ""); + /** + * The column mysql.proc.character_set_client. + */ + public static final 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.length(32), PROC, ""); + /** + * The column mysql.proc.collation_connection. + */ + public static final 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.length(32), PROC, ""); + /** + * The column mysql.proc.db_collation. + */ + public static final TableField DB_COLLATION = createField("db_collation", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, ""); - /** - * The column mysql.proc.body_utf8. - */ - public static final org.jooq.TableField BODY_UTF8 = createField("body_utf8", org.jooq.impl.SQLDataType.BLOB, PROC, ""); + /** + * The column mysql.proc.body_utf8. + */ + public static final TableField BODY_UTF8 = createField("body_utf8", org.jooq.impl.SQLDataType.BLOB, PROC, ""); - /** - * No further instances allowed - */ - private Proc() { - this("proc", null); - } + /** + * No further instances allowed + */ + private Proc() { + this("proc", null); + } - private Proc(java.lang.String alias, org.jooq.Table aliased) { - this(alias, aliased, null); - } + private Proc(String alias, Table aliased) { + this(alias, aliased, null); + } - private Proc(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { - super(alias, org.jooq.util.mysql.mysql.Mysql.MYSQL, aliased, parameters, "Stored Procedures"); - } + private Proc(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, "Stored Procedures"); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Mysql.MYSQL; + } } 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 063daab3ac..d7a4523c9d 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 @@ -3,83 +3,109 @@ */ package org.jooq.util.mysql.mysql.tables; + +import java.sql.Timestamp; + +import javax.annotation.Generated; + +import org.jooq.Field; +import org.jooq.Record; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.impl.TableImpl; +import org.jooq.util.mysql.mysql.Mysql; +import org.jooq.util.mysql.mysql.enums.ProcsPrivRoutineType; + + /** - * This class is generated by jOOQ. - * * Procedure privileges */ -@javax.annotation.Generated(value = { "http://www.jooq.org", "3.4.0" }, - comments = "This class is generated by jOOQ") -@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class ProcsPriv extends org.jooq.impl.TableImpl { +@Generated( + value = { + "http://www.jooq.org", + "jOOQ version:3.9.0" + }, + comments = "This class is generated by jOOQ" +) +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ProcsPriv extends TableImpl { - private static final long serialVersionUID = -1879514011; + private static final long serialVersionUID = -1425770453; - /** - * The singleton instance of mysql.procs_priv - */ - public static final org.jooq.util.mysql.mysql.tables.ProcsPriv PROCS_PRIV = new org.jooq.util.mysql.mysql.tables.ProcsPriv(); + /** + * The reference instance of mysql.procs_priv + */ + public static final ProcsPriv PROCS_PRIV = new ProcsPriv(); - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return org.jooq.Record.class; - } + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } - /** - * The column mysql.procs_priv.Host. - */ - public static final org.jooq.TableField HOST = createField("Host", org.jooq.impl.SQLDataType.CHAR.length(60).nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Host. + */ + public static final TableField HOST = createField("Host", org.jooq.impl.SQLDataType.CHAR.length(60).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROCS_PRIV, ""); - /** - * The column mysql.procs_priv.Db. - */ - public static final org.jooq.TableField DB = createField("Db", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Db. + */ + public static final TableField DB = createField("Db", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROCS_PRIV, ""); - /** - * The column mysql.procs_priv.User. - */ - public static final org.jooq.TableField USER = createField("User", org.jooq.impl.SQLDataType.CHAR.length(16).nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.User. + */ + public static final TableField USER = createField("User", org.jooq.impl.SQLDataType.CHAR.length(32).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), 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.length(64).nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Routine_name. + */ + public static final TableField ROUTINE_NAME = createField("Routine_name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), PROCS_PRIV, ""); - /** - * The column mysql.procs_priv.Routine_type. - */ - public static final org.jooq.TableField ROUTINE_TYPE = createField("Routine_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcsPrivRoutineType.class), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Routine_type. + */ + public static final TableField ROUTINE_TYPE = createField("Routine_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcsPrivRoutineType.class), PROCS_PRIV, ""); - /** - * The column mysql.procs_priv.Grantor. - */ - public static final org.jooq.TableField GRANTOR = createField("Grantor", org.jooq.impl.SQLDataType.CHAR.length(77).nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Grantor. + */ + public static final TableField GRANTOR = createField("Grantor", org.jooq.impl.SQLDataType.CHAR.length(77).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.CHAR)), 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.length(27).nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Proc_priv. + */ + public static final TableField PROC_PRIV = createField("Proc_priv", org.jooq.impl.SQLDataType.VARCHAR.length(27).nullable(false).defaultValue(org.jooq.impl.DSL.inline("", org.jooq.impl.SQLDataType.VARCHAR)), PROCS_PRIV, ""); - /** - * The column mysql.procs_priv.Timestamp. - */ - public static final org.jooq.TableField TIMESTAMP = createField("Timestamp", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), PROCS_PRIV, ""); + /** + * The column mysql.procs_priv.Timestamp. + */ + public static final TableField TIMESTAMP = createField("Timestamp", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.inline("CURRENT_TIMESTAMP", org.jooq.impl.SQLDataType.TIMESTAMP)), PROCS_PRIV, ""); - /** - * No further instances allowed - */ - private ProcsPriv() { - this("procs_priv", null); - } + /** + * No further instances allowed + */ + private ProcsPriv() { + this("procs_priv", null); + } - private ProcsPriv(java.lang.String alias, org.jooq.Table aliased) { - this(alias, aliased, null); - } + private ProcsPriv(String alias, Table aliased) { + this(alias, aliased, null); + } - private ProcsPriv(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field[] parameters) { - super(alias, org.jooq.util.mysql.mysql.Mysql.MYSQL, aliased, parameters, "Procedure privileges"); - } + private ProcsPriv(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, "Procedure privileges"); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Mysql.MYSQL; + } }