[#5467] Fixed regression and re-generated jOOQ-meta

This commit is contained in:
lukaseder 2016-07-27 16:39:33 +02:00
parent e22561a48b
commit 668d9dd731
12 changed files with 706 additions and 400 deletions

View File

@ -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("}");

View File

@ -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 <code></code>
*/
public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
/**
* The schema <code>mysql</code>.
*/
public final Mysql MYSQL = org.jooq.util.mysql.mysql.Mysql.MYSQL;
/**
* No further instances allowed
*/
private DefaultCatalog() {
super("");
}
@Override
public final List<Schema> getSchemas() {
List result = new ArrayList();
result.addAll(getSchemas0());
return result;
}
private final List<Schema> getSchemas0() {
return Arrays.<Schema>asList(
Mysql.MYSQL);
}
}

View File

@ -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 <code>mysql</code>
*/
public static final Mysql MYSQL = new Mysql();
/**
* The reference instance of <code>mysql</code>
*/
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<org.jooq.Table<?>> 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<org.jooq.Table<?>> getTables0() {
return java.util.Arrays.<org.jooq.Table<?>>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<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList(
Proc.PROC,
ProcsPriv.PROCS_PRIV);
}
}

View File

@ -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;
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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<org.jooq.Record> {
@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<Record> {
private static final long serialVersionUID = 1513690807;
private static final long serialVersionUID = -765641597;
/**
* The singleton instance of <code>mysql.proc</code>
*/
public static final org.jooq.util.mysql.mysql.tables.Proc PROC = new org.jooq.util.mysql.mysql.tables.Proc();
/**
* The reference instance of <code>mysql.proc</code>
*/
public static final Proc PROC = new Proc();
/**
* The class holding records for this type
*/
@Override
public java.lang.Class<org.jooq.Record> getRecordType() {
return org.jooq.Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>mysql.proc.db</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DB = createField("db", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.db</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.proc.name</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> NAME = createField("name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.name</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.proc.type</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, org.jooq.util.mysql.mysql.enums.ProcType> TYPE = createField("type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcType.class), PROC, "");
/**
* The column <code>mysql.proc.type</code>.
*/
public static final TableField<Record, ProcType> TYPE = createField("type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcType.class), PROC, "");
/**
* The column <code>mysql.proc.specific_name</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SPECIFIC_NAME = createField("specific_name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.specific_name</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.proc.language</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, org.jooq.util.mysql.mysql.enums.ProcLanguage> LANGUAGE = createField("language", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcLanguage.class), PROC, "");
/**
* The column <code>mysql.proc.language</code>.
*/
public static final TableField<Record, ProcLanguage> LANGUAGE = createField("language", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcLanguage.class), PROC, "");
/**
* The column <code>mysql.proc.sql_data_access</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, org.jooq.util.mysql.mysql.enums.ProcSqlDataAccess> 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 <code>mysql.proc.sql_data_access</code>.
*/
public static final TableField<Record, ProcSqlDataAccess> 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 <code>mysql.proc.is_deterministic</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, org.jooq.util.mysql.mysql.enums.ProcIsDeterministic> IS_DETERMINISTIC = createField("is_deterministic", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcIsDeterministic.class), PROC, "");
/**
* The column <code>mysql.proc.is_deterministic</code>.
*/
public static final TableField<Record, ProcIsDeterministic> IS_DETERMINISTIC = createField("is_deterministic", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcIsDeterministic.class), PROC, "");
/**
* The column <code>mysql.proc.security_type</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, org.jooq.util.mysql.mysql.enums.ProcSecurityType> SECURITY_TYPE = createField("security_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcSecurityType.class), PROC, "");
/**
* The column <code>mysql.proc.security_type</code>.
*/
public static final TableField<Record, ProcSecurityType> SECURITY_TYPE = createField("security_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcSecurityType.class), PROC, "");
/**
* The column <code>mysql.proc.param_list</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, byte[]> PARAM_LIST = createField("param_list", org.jooq.impl.SQLDataType.BLOB.length(65535).nullable(false), PROC, "");
/**
* The column <code>mysql.proc.param_list</code>.
*/
public static final TableField<Record, byte[]> PARAM_LIST = createField("param_list", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, "");
/**
* The column <code>mysql.proc.returns</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, byte[]> RETURNS = createField("returns", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, "");
/**
* The column <code>mysql.proc.returns</code>.
*/
public static final TableField<Record, byte[]> RETURNS = createField("returns", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, "");
/**
* The column <code>mysql.proc.body</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, byte[]> BODY = createField("body", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, "");
/**
* The column <code>mysql.proc.body</code>.
*/
public static final TableField<Record, byte[]> BODY = createField("body", org.jooq.impl.SQLDataType.BLOB.nullable(false), PROC, "");
/**
* The column <code>mysql.proc.definer</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DEFINER = createField("definer", org.jooq.impl.SQLDataType.CHAR.length(77).nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.definer</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.proc.created</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> CREATED = createField("created", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.created</code>.
*/
public static final TableField<Record, Timestamp> 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 <code>mysql.proc.modified</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> MODIFIED = createField("modified", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.modified</code>.
*/
public static final TableField<Record, Timestamp> 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 <code>mysql.proc.sql_mode</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> SQL_MODE = createField("sql_mode", org.jooq.impl.SQLDataType.VARCHAR.length(478).nullable(false).defaulted(true), PROC, "");
/**
* The column <code>mysql.proc.sql_mode</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.proc.comment</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COMMENT = createField("comment", org.jooq.impl.SQLDataType.CLOB.length(65535).nullable(false), PROC, "");
/**
* The column <code>mysql.proc.comment</code>.
*/
public static final TableField<Record, String> COMMENT = createField("comment", org.jooq.impl.SQLDataType.CLOB.nullable(false), PROC, "");
/**
* The column <code>mysql.proc.character_set_client</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> CHARACTER_SET_CLIENT = createField("character_set_client", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, "");
/**
* The column <code>mysql.proc.character_set_client</code>.
*/
public static final TableField<Record, String> CHARACTER_SET_CLIENT = createField("character_set_client", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, "");
/**
* The column <code>mysql.proc.collation_connection</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> COLLATION_CONNECTION = createField("collation_connection", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, "");
/**
* The column <code>mysql.proc.collation_connection</code>.
*/
public static final TableField<Record, String> COLLATION_CONNECTION = createField("collation_connection", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, "");
/**
* The column <code>mysql.proc.db_collation</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DB_COLLATION = createField("db_collation", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, "");
/**
* The column <code>mysql.proc.db_collation</code>.
*/
public static final TableField<Record, String> DB_COLLATION = createField("db_collation", org.jooq.impl.SQLDataType.CHAR.length(32), PROC, "");
/**
* The column <code>mysql.proc.body_utf8</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, byte[]> BODY_UTF8 = createField("body_utf8", org.jooq.impl.SQLDataType.BLOB, PROC, "");
/**
* The column <code>mysql.proc.body_utf8</code>.
*/
public static final TableField<Record, byte[]> 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<org.jooq.Record> aliased) {
this(alias, aliased, null);
}
private Proc(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Proc(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
super(alias, org.jooq.util.mysql.mysql.Mysql.MYSQL, aliased, parameters, "Stored Procedures");
}
private Proc(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "Stored Procedures");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Mysql.MYSQL;
}
}

View File

@ -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<org.jooq.Record> {
@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<Record> {
private static final long serialVersionUID = -1879514011;
private static final long serialVersionUID = -1425770453;
/**
* The singleton instance of <code>mysql.procs_priv</code>
*/
public static final org.jooq.util.mysql.mysql.tables.ProcsPriv PROCS_PRIV = new org.jooq.util.mysql.mysql.tables.ProcsPriv();
/**
* The reference instance of <code>mysql.procs_priv</code>
*/
public static final ProcsPriv PROCS_PRIV = new ProcsPriv();
/**
* The class holding records for this type
*/
@Override
public java.lang.Class<org.jooq.Record> getRecordType() {
return org.jooq.Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>mysql.procs_priv.Host</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> HOST = createField("Host", org.jooq.impl.SQLDataType.CHAR.length(60).nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Host</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.procs_priv.Db</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> DB = createField("Db", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Db</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.procs_priv.User</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> USER = createField("User", org.jooq.impl.SQLDataType.CHAR.length(16).nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.User</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.procs_priv.Routine_name</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> ROUTINE_NAME = createField("Routine_name", org.jooq.impl.SQLDataType.CHAR.length(64).nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Routine_name</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.procs_priv.Routine_type</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, org.jooq.util.mysql.mysql.enums.ProcsPrivRoutineType> ROUTINE_TYPE = createField("Routine_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcsPrivRoutineType.class), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Routine_type</code>.
*/
public static final TableField<Record, ProcsPrivRoutineType> ROUTINE_TYPE = createField("Routine_type", org.jooq.util.mysql.MySQLDataType.VARCHAR.asEnumDataType(org.jooq.util.mysql.mysql.enums.ProcsPrivRoutineType.class), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Grantor</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> GRANTOR = createField("Grantor", org.jooq.impl.SQLDataType.CHAR.length(77).nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Grantor</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.procs_priv.Proc_priv</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.lang.String> PROC_PRIV = createField("Proc_priv", org.jooq.impl.SQLDataType.VARCHAR.length(27).nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Proc_priv</code>.
*/
public static final TableField<Record, String> 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 <code>mysql.procs_priv.Timestamp</code>.
*/
public static final org.jooq.TableField<org.jooq.Record, java.sql.Timestamp> TIMESTAMP = createField("Timestamp", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), PROCS_PRIV, "");
/**
* The column <code>mysql.procs_priv.Timestamp</code>.
*/
public static final TableField<Record, Timestamp> 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<org.jooq.Record> aliased) {
this(alias, aliased, null);
}
private ProcsPriv(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private ProcsPriv(java.lang.String alias, org.jooq.Table<org.jooq.Record> aliased, org.jooq.Field<?>[] parameters) {
super(alias, org.jooq.util.mysql.mysql.Mysql.MYSQL, aliased, parameters, "Procedure privileges");
}
private ProcsPriv(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "Procedure privileges");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Mysql.MYSQL;
}
}