From 70fbda2e860dcb2fc25432dc14c0510d6da011c1 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 3 Mar 2012 21:05:06 +0000 Subject: [PATCH] [#1211] Enforce method name disambiguation also when using custom strategies (regression of #182) [#1212] Enforce identifier disambiguation also when using custom strategies (regression) --- .../person/tables/Addresstype.java | 87 -------- .../person/tables/Contacttype.java | 82 -------- .../person/tables/Countryregion.java | 77 -------- .../person/tables/Stateprovince.java | 125 ------------ .../person/tables/Vadditionalcontactinfo.java | 139 ------------- .../tables/Vstateprovincecountryregion.java | 84 -------- .../person/tables/pojos/Addresstype.java | 56 ------ .../person/tables/pojos/Contacttype.java | 46 ----- .../person/tables/pojos/Countryregion.java | 46 ----- .../person/tables/pojos/Stateprovince.java | 96 --------- .../tables/pojos/Vadditionalcontactinfo.java | 185 ------------------ .../pojos/Vstateprovincecountryregion.java | 85 -------- 12 files changed, 1108 deletions(-) delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Addresstype.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Contacttype.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Countryregion.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Stateprovince.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vadditionalcontactinfo.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vstateprovincecountryregion.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Addresstype.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contacttype.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Countryregion.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Stateprovince.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vadditionalcontactinfo.java delete mode 100644 jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vstateprovincecountryregion.java diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Addresstype.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Addresstype.java deleted file mode 100644 index 98fd92b959..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Addresstype.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables; - -/** - * This class is generated by jOOQ. - */ -public class AddressType extends org.jooq.impl.UpdatableTableImpl { - - private static final long serialVersionUID = 1295094076; - - /** - * The singleton instance of Person.AddressType - */ - public static final org.jooq.examples.sqlserver.adventureworks.person.tables.AddressType AddressType = new org.jooq.examples.sqlserver.adventureworks.person.tables.AddressType(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.examples.sqlserver.adventureworks.person.tables.records.AddressType.class; - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return __RECORD_TYPE; - } - - /** - * An uncommented item - * - * PRIMARY KEY - */ - public final org.jooq.TableField AddressTypeID = createField("AddressTypeID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField Name = createField("Name", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField rowguid = createField("rowguid", org.jooq.impl.SQLDataType.VARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField ModifiedDate = createField("ModifiedDate", org.jooq.impl.SQLDataType.TIMESTAMP, this); - - /** - * No further instances allowed - */ - private AddressType() { - super("AddressType", org.jooq.examples.sqlserver.adventureworks.person.Person.Person); - } - - /** - * No further instances allowed - */ - private AddressType(java.lang.String alias) { - super(alias, org.jooq.examples.sqlserver.adventureworks.person.Person.Person, org.jooq.examples.sqlserver.adventureworks.person.tables.AddressType.AddressType); - } - - @Override - public org.jooq.Identity getIdentity() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.IDENTITY_AddressType; - } - - @Override - public org.jooq.UniqueKey getMainKey() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_AddressType_AddressTypeID; - } - - @Override - @SuppressWarnings("unchecked") - public java.util.List> getKeys() { - return java.util.Arrays.>asList(org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_AddressType_AddressTypeID); - } - - @Override - public org.jooq.examples.sqlserver.adventureworks.person.tables.AddressType as(java.lang.String alias) { - return new org.jooq.examples.sqlserver.adventureworks.person.tables.AddressType(alias); - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Contacttype.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Contacttype.java deleted file mode 100644 index ee3a13867e..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Contacttype.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables; - -/** - * This class is generated by jOOQ. - */ -public class ContactType extends org.jooq.impl.UpdatableTableImpl { - - private static final long serialVersionUID = 1713518750; - - /** - * The singleton instance of Person.ContactType - */ - public static final org.jooq.examples.sqlserver.adventureworks.person.tables.ContactType ContactType = new org.jooq.examples.sqlserver.adventureworks.person.tables.ContactType(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.examples.sqlserver.adventureworks.person.tables.records.ContactType.class; - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return __RECORD_TYPE; - } - - /** - * An uncommented item - * - * PRIMARY KEY - */ - public final org.jooq.TableField ContactTypeID = createField("ContactTypeID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField Name = createField("Name", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField ModifiedDate = createField("ModifiedDate", org.jooq.impl.SQLDataType.TIMESTAMP, this); - - /** - * No further instances allowed - */ - private ContactType() { - super("ContactType", org.jooq.examples.sqlserver.adventureworks.person.Person.Person); - } - - /** - * No further instances allowed - */ - private ContactType(java.lang.String alias) { - super(alias, org.jooq.examples.sqlserver.adventureworks.person.Person.Person, org.jooq.examples.sqlserver.adventureworks.person.tables.ContactType.ContactType); - } - - @Override - public org.jooq.Identity getIdentity() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.IDENTITY_ContactType; - } - - @Override - public org.jooq.UniqueKey getMainKey() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_ContactType_ContactTypeID; - } - - @Override - @SuppressWarnings("unchecked") - public java.util.List> getKeys() { - return java.util.Arrays.>asList(org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_ContactType_ContactTypeID); - } - - @Override - public org.jooq.examples.sqlserver.adventureworks.person.tables.ContactType as(java.lang.String alias) { - return new org.jooq.examples.sqlserver.adventureworks.person.tables.ContactType(alias); - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Countryregion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Countryregion.java deleted file mode 100644 index bbc4c847e3..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Countryregion.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables; - -/** - * This class is generated by jOOQ. - */ -public class CountryRegion extends org.jooq.impl.UpdatableTableImpl { - - private static final long serialVersionUID = 1264003475; - - /** - * The singleton instance of Person.CountryRegion - */ - public static final org.jooq.examples.sqlserver.adventureworks.person.tables.CountryRegion CountryRegion = new org.jooq.examples.sqlserver.adventureworks.person.tables.CountryRegion(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.examples.sqlserver.adventureworks.person.tables.records.CountryRegion.class; - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return __RECORD_TYPE; - } - - /** - * An uncommented item - * - * PRIMARY KEY - */ - public final org.jooq.TableField CountryRegionCode = createField("CountryRegionCode", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField Name = createField("Name", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField ModifiedDate = createField("ModifiedDate", org.jooq.impl.SQLDataType.TIMESTAMP, this); - - /** - * No further instances allowed - */ - private CountryRegion() { - super("CountryRegion", org.jooq.examples.sqlserver.adventureworks.person.Person.Person); - } - - /** - * No further instances allowed - */ - private CountryRegion(java.lang.String alias) { - super(alias, org.jooq.examples.sqlserver.adventureworks.person.Person.Person, org.jooq.examples.sqlserver.adventureworks.person.tables.CountryRegion.CountryRegion); - } - - @Override - public org.jooq.UniqueKey getMainKey() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_CountryRegion_CountryRegionCode; - } - - @Override - @SuppressWarnings("unchecked") - public java.util.List> getKeys() { - return java.util.Arrays.>asList(org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_CountryRegion_CountryRegionCode); - } - - @Override - public org.jooq.examples.sqlserver.adventureworks.person.tables.CountryRegion as(java.lang.String alias) { - return new org.jooq.examples.sqlserver.adventureworks.person.tables.CountryRegion(alias); - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Stateprovince.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Stateprovince.java deleted file mode 100644 index 64c5e2c057..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Stateprovince.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables; - -/** - * This class is generated by jOOQ. - */ -public class StateProvince extends org.jooq.impl.UpdatableTableImpl { - - private static final long serialVersionUID = 287362667; - - /** - * The singleton instance of Person.StateProvince - */ - public static final org.jooq.examples.sqlserver.adventureworks.person.tables.StateProvince StateProvince = new org.jooq.examples.sqlserver.adventureworks.person.tables.StateProvince(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.examples.sqlserver.adventureworks.person.tables.records.StateProvince.class; - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return __RECORD_TYPE; - } - - /** - * An uncommented item - * - * PRIMARY KEY - */ - public final org.jooq.TableField StateProvinceID = createField("StateProvinceID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField StateProvinceCode = createField("StateProvinceCode", org.jooq.impl.SQLDataType.NCHAR, this); - - /** - * An uncommented item - *

- * 

-	 * CONSTRAINT FK_StateProvince_CountryRegion_CountryRegionCode
-	 * FOREIGN KEY (CountryRegionCode)
-	 * REFERENCES Person.CountryRegion (CountryRegionCode)
-	 *
- */ - public final org.jooq.TableField CountryRegionCode = createField("CountryRegionCode", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField IsOnlyStateProvinceFlag = createField("IsOnlyStateProvinceFlag", org.jooq.impl.SQLDataType.BIT, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField Name = createField("Name", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - *

- * 

-	 * CONSTRAINT FK_StateProvince_SalesTerritory_TerritoryID
-	 * FOREIGN KEY (TerritoryID)
-	 * REFERENCES Sales.SalesTerritory (TerritoryID)
-	 *
- */ - public final org.jooq.TableField TerritoryID = createField("TerritoryID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField rowguid = createField("rowguid", org.jooq.impl.SQLDataType.VARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField ModifiedDate = createField("ModifiedDate", org.jooq.impl.SQLDataType.TIMESTAMP, this); - - /** - * No further instances allowed - */ - private StateProvince() { - super("StateProvince", org.jooq.examples.sqlserver.adventureworks.person.Person.Person); - } - - /** - * No further instances allowed - */ - private StateProvince(java.lang.String alias) { - super(alias, org.jooq.examples.sqlserver.adventureworks.person.Person.Person, org.jooq.examples.sqlserver.adventureworks.person.tables.StateProvince.StateProvince); - } - - @Override - public org.jooq.Identity getIdentity() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.IDENTITY_StateProvince; - } - - @Override - public org.jooq.UniqueKey getMainKey() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_StateProvince_StateProvinceID; - } - - @Override - @SuppressWarnings("unchecked") - public java.util.List> getKeys() { - return java.util.Arrays.>asList(org.jooq.examples.sqlserver.adventureworks.person.Keys.PK_StateProvince_StateProvinceID); - } - - @Override - @SuppressWarnings("unchecked") - public java.util.List> getReferences() { - return java.util.Arrays.>asList(org.jooq.examples.sqlserver.adventureworks.person.Keys.FK_StateProvince_CountryRegion_CountryRegionCode, org.jooq.examples.sqlserver.adventureworks.person.Keys.FK_StateProvince_SalesTerritory_TerritoryID); - } - - @Override - public org.jooq.examples.sqlserver.adventureworks.person.tables.StateProvince as(java.lang.String alias) { - return new org.jooq.examples.sqlserver.adventureworks.person.tables.StateProvince(alias); - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vadditionalcontactinfo.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vadditionalcontactinfo.java deleted file mode 100644 index 9835b928a0..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vadditionalcontactinfo.java +++ /dev/null @@ -1,139 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables; - -/** - * This class is generated by jOOQ. - */ -public class vAdditionalContactInfo extends org.jooq.impl.TableImpl { - - private static final long serialVersionUID = 939403023; - - /** - * The singleton instance of Person.vAdditionalContactInfo - */ - public static final org.jooq.examples.sqlserver.adventureworks.person.tables.vAdditionalContactInfo vAdditionalContactInfo = new org.jooq.examples.sqlserver.adventureworks.person.tables.vAdditionalContactInfo(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.examples.sqlserver.adventureworks.person.tables.records.vAdditionalContactInfo.class; - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return __RECORD_TYPE; - } - - /** - * An uncommented item - */ - public final org.jooq.TableField ContactID = createField("ContactID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField FirstName = createField("FirstName", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField MiddleName = createField("MiddleName", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField LastName = createField("LastName", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField TelephoneNumber = createField("TelephoneNumber", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField TelephoneSpecialInstructions = createField("TelephoneSpecialInstructions", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField Street = createField("Street", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField City = createField("City", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField StateProvince = createField("StateProvince", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField PostalCode = createField("PostalCode", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField CountryRegion = createField("CountryRegion", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField HomeAddressSpecialInstructions = createField("HomeAddressSpecialInstructions", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField EMailAddress = createField("EMailAddress", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField EMailSpecialInstructions = createField("EMailSpecialInstructions", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField EMailTelephoneNumber = createField("EMailTelephoneNumber", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField rowguid = createField("rowguid", org.jooq.impl.SQLDataType.VARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField ModifiedDate = createField("ModifiedDate", org.jooq.impl.SQLDataType.TIMESTAMP, this); - - /** - * No further instances allowed - */ - private vAdditionalContactInfo() { - super("vAdditionalContactInfo", org.jooq.examples.sqlserver.adventureworks.person.Person.Person); - } - - /** - * No further instances allowed - */ - private vAdditionalContactInfo(java.lang.String alias) { - super(alias, org.jooq.examples.sqlserver.adventureworks.person.Person.Person, org.jooq.examples.sqlserver.adventureworks.person.tables.vAdditionalContactInfo.vAdditionalContactInfo); - } - - @Override - public org.jooq.Identity getIdentity() { - return org.jooq.examples.sqlserver.adventureworks.person.Keys.IDENTITY_vAdditionalContactInfo; - } - - @Override - public org.jooq.examples.sqlserver.adventureworks.person.tables.vAdditionalContactInfo as(java.lang.String alias) { - return new org.jooq.examples.sqlserver.adventureworks.person.tables.vAdditionalContactInfo(alias); - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vstateprovincecountryregion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vstateprovincecountryregion.java deleted file mode 100644 index a21b48a7e1..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/Vstateprovincecountryregion.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables; - -/** - * This class is generated by jOOQ. - */ -public class vStateProvinceCountryRegion extends org.jooq.impl.TableImpl { - - private static final long serialVersionUID = 1328451346; - - /** - * The singleton instance of Person.vStateProvinceCountryRegion - */ - public static final org.jooq.examples.sqlserver.adventureworks.person.tables.vStateProvinceCountryRegion vStateProvinceCountryRegion = new org.jooq.examples.sqlserver.adventureworks.person.tables.vStateProvinceCountryRegion(); - - /** - * The class holding records for this type - */ - private static final java.lang.Class __RECORD_TYPE = org.jooq.examples.sqlserver.adventureworks.person.tables.records.vStateProvinceCountryRegion.class; - - /** - * The class holding records for this type - */ - @Override - public java.lang.Class getRecordType() { - return __RECORD_TYPE; - } - - /** - * An uncommented item - */ - public final org.jooq.TableField StateProvinceID = createField("StateProvinceID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField StateProvinceCode = createField("StateProvinceCode", org.jooq.impl.SQLDataType.NCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField IsOnlyStateProvinceFlag = createField("IsOnlyStateProvinceFlag", org.jooq.impl.SQLDataType.BIT, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField StateProvinceName = createField("StateProvinceName", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField TerritoryID = createField("TerritoryID", org.jooq.impl.SQLDataType.INTEGER, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField CountryRegionCode = createField("CountryRegionCode", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * An uncommented item - */ - public final org.jooq.TableField CountryRegionName = createField("CountryRegionName", org.jooq.impl.SQLDataType.NVARCHAR, this); - - /** - * No further instances allowed - */ - private vStateProvinceCountryRegion() { - super("vStateProvinceCountryRegion", org.jooq.examples.sqlserver.adventureworks.person.Person.Person); - } - - /** - * No further instances allowed - */ - private vStateProvinceCountryRegion(java.lang.String alias) { - super(alias, org.jooq.examples.sqlserver.adventureworks.person.Person.Person, org.jooq.examples.sqlserver.adventureworks.person.tables.vStateProvinceCountryRegion.vStateProvinceCountryRegion); - } - - @Override - public org.jooq.examples.sqlserver.adventureworks.person.tables.vStateProvinceCountryRegion as(java.lang.String alias) { - return new org.jooq.examples.sqlserver.adventureworks.person.tables.vStateProvinceCountryRegion(alias); - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Addresstype.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Addresstype.java deleted file mode 100644 index 884cb7fea5..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Addresstype.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos; - -/** - * This class is generated by jOOQ. - */ -@javax.persistence.Entity -@javax.persistence.Table(name = "AddressType", schema = "Person") -public class AddressType implements java.io.Serializable { - - private static final long serialVersionUID = 943628619; - - private java.lang.Integer AddressTypeID; - private java.lang.String Name; - private java.lang.String rowguid; - private java.sql.Timestamp ModifiedDate; - - @javax.persistence.Id - @javax.persistence.Column(name = "AddressTypeID", unique = true, nullable = false) - public java.lang.Integer getAddressTypeID() { - return this.AddressTypeID; - } - - public void setAddressTypeID(java.lang.Integer AddressTypeID) { - this.AddressTypeID = AddressTypeID; - } - - @javax.persistence.Column(name = "Name", nullable = false) - public java.lang.String getName() { - return this.Name; - } - - public void setName(java.lang.String Name) { - this.Name = Name; - } - - @javax.persistence.Column(name = "rowguid", nullable = false) - public java.lang.String getrowguid() { - return this.rowguid; - } - - public void setrowguid(java.lang.String rowguid) { - this.rowguid = rowguid; - } - - @javax.persistence.Column(name = "ModifiedDate", nullable = false) - public java.sql.Timestamp getModifiedDate() { - return this.ModifiedDate; - } - - public void setModifiedDate(java.sql.Timestamp ModifiedDate) { - this.ModifiedDate = ModifiedDate; - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contacttype.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contacttype.java deleted file mode 100644 index 3d09d0865b..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contacttype.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos; - -/** - * This class is generated by jOOQ. - */ -@javax.persistence.Entity -@javax.persistence.Table(name = "ContactType", schema = "Person") -public class ContactType implements java.io.Serializable { - - private static final long serialVersionUID = 1577140314; - - private java.lang.Integer ContactTypeID; - private java.lang.String Name; - private java.sql.Timestamp ModifiedDate; - - @javax.persistence.Id - @javax.persistence.Column(name = "ContactTypeID", unique = true, nullable = false) - public java.lang.Integer getContactTypeID() { - return this.ContactTypeID; - } - - public void setContactTypeID(java.lang.Integer ContactTypeID) { - this.ContactTypeID = ContactTypeID; - } - - @javax.persistence.Column(name = "Name", nullable = false) - public java.lang.String getName() { - return this.Name; - } - - public void setName(java.lang.String Name) { - this.Name = Name; - } - - @javax.persistence.Column(name = "ModifiedDate", nullable = false) - public java.sql.Timestamp getModifiedDate() { - return this.ModifiedDate; - } - - public void setModifiedDate(java.sql.Timestamp ModifiedDate) { - this.ModifiedDate = ModifiedDate; - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Countryregion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Countryregion.java deleted file mode 100644 index 8bdfa8ea88..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Countryregion.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos; - -/** - * This class is generated by jOOQ. - */ -@javax.persistence.Entity -@javax.persistence.Table(name = "CountryRegion", schema = "Person") -public class CountryRegion implements java.io.Serializable { - - private static final long serialVersionUID = 226974233; - - private java.lang.String CountryRegionCode; - private java.lang.String Name; - private java.sql.Timestamp ModifiedDate; - - @javax.persistence.Id - @javax.persistence.Column(name = "CountryRegionCode", unique = true, nullable = false) - public java.lang.String getCountryRegionCode() { - return this.CountryRegionCode; - } - - public void setCountryRegionCode(java.lang.String CountryRegionCode) { - this.CountryRegionCode = CountryRegionCode; - } - - @javax.persistence.Column(name = "Name", nullable = false) - public java.lang.String getName() { - return this.Name; - } - - public void setName(java.lang.String Name) { - this.Name = Name; - } - - @javax.persistence.Column(name = "ModifiedDate", nullable = false) - public java.sql.Timestamp getModifiedDate() { - return this.ModifiedDate; - } - - public void setModifiedDate(java.sql.Timestamp ModifiedDate) { - this.ModifiedDate = ModifiedDate; - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Stateprovince.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Stateprovince.java deleted file mode 100644 index b32a7c7c44..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Stateprovince.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos; - -/** - * This class is generated by jOOQ. - */ -@javax.persistence.Entity -@javax.persistence.Table(name = "StateProvince", schema = "Person") -public class StateProvince implements java.io.Serializable { - - private static final long serialVersionUID = -456749505; - - private java.lang.Integer StateProvinceID; - private java.lang.String StateProvinceCode; - private java.lang.String CountryRegionCode; - private java.lang.Boolean IsOnlyStateProvinceFlag; - private java.lang.String Name; - private java.lang.Integer TerritoryID; - private java.lang.String rowguid; - private java.sql.Timestamp ModifiedDate; - - @javax.persistence.Id - @javax.persistence.Column(name = "StateProvinceID", unique = true, nullable = false) - public java.lang.Integer getStateProvinceID() { - return this.StateProvinceID; - } - - public void setStateProvinceID(java.lang.Integer StateProvinceID) { - this.StateProvinceID = StateProvinceID; - } - - @javax.persistence.Column(name = "StateProvinceCode", nullable = false) - public java.lang.String getStateProvinceCode() { - return this.StateProvinceCode; - } - - public void setStateProvinceCode(java.lang.String StateProvinceCode) { - this.StateProvinceCode = StateProvinceCode; - } - - @javax.persistence.Column(name = "CountryRegionCode", nullable = false) - public java.lang.String getCountryRegionCode() { - return this.CountryRegionCode; - } - - public void setCountryRegionCode(java.lang.String CountryRegionCode) { - this.CountryRegionCode = CountryRegionCode; - } - - @javax.persistence.Column(name = "IsOnlyStateProvinceFlag", nullable = false) - public java.lang.Boolean getIsOnlyStateProvinceFlag() { - return this.IsOnlyStateProvinceFlag; - } - - public void setIsOnlyStateProvinceFlag(java.lang.Boolean IsOnlyStateProvinceFlag) { - this.IsOnlyStateProvinceFlag = IsOnlyStateProvinceFlag; - } - - @javax.persistence.Column(name = "Name", nullable = false) - public java.lang.String getName() { - return this.Name; - } - - public void setName(java.lang.String Name) { - this.Name = Name; - } - - @javax.persistence.Column(name = "TerritoryID", nullable = false) - public java.lang.Integer getTerritoryID() { - return this.TerritoryID; - } - - public void setTerritoryID(java.lang.Integer TerritoryID) { - this.TerritoryID = TerritoryID; - } - - @javax.persistence.Column(name = "rowguid", nullable = false) - public java.lang.String getrowguid() { - return this.rowguid; - } - - public void setrowguid(java.lang.String rowguid) { - this.rowguid = rowguid; - } - - @javax.persistence.Column(name = "ModifiedDate", nullable = false) - public java.sql.Timestamp getModifiedDate() { - return this.ModifiedDate; - } - - public void setModifiedDate(java.sql.Timestamp ModifiedDate) { - this.ModifiedDate = ModifiedDate; - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vadditionalcontactinfo.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vadditionalcontactinfo.java deleted file mode 100644 index 94ece3471b..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vadditionalcontactinfo.java +++ /dev/null @@ -1,185 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos; - -/** - * This class is generated by jOOQ. - */ -@javax.persistence.Entity -@javax.persistence.Table(name = "vAdditionalContactInfo", schema = "Person") -public class vAdditionalContactInfo implements java.io.Serializable { - - private static final long serialVersionUID = -1861307589; - - private java.lang.Integer ContactID; - private java.lang.String FirstName; - private java.lang.String MiddleName; - private java.lang.String LastName; - private java.lang.String TelephoneNumber; - private java.lang.String TelephoneSpecialInstructions; - private java.lang.String Street; - private java.lang.String City; - private java.lang.String StateProvince; - private java.lang.String PostalCode; - private java.lang.String CountryRegion; - private java.lang.String HomeAddressSpecialInstructions; - private java.lang.String EMailAddress; - private java.lang.String EMailSpecialInstructions; - private java.lang.String EMailTelephoneNumber; - private java.lang.String rowguid; - private java.sql.Timestamp ModifiedDate; - - @javax.persistence.Column(name = "ContactID", nullable = false) - public java.lang.Integer getContactID() { - return this.ContactID; - } - - public void setContactID(java.lang.Integer ContactID) { - this.ContactID = ContactID; - } - - @javax.persistence.Column(name = "FirstName", nullable = false) - public java.lang.String getFirstName() { - return this.FirstName; - } - - public void setFirstName(java.lang.String FirstName) { - this.FirstName = FirstName; - } - - @javax.persistence.Column(name = "MiddleName") - public java.lang.String getMiddleName() { - return this.MiddleName; - } - - public void setMiddleName(java.lang.String MiddleName) { - this.MiddleName = MiddleName; - } - - @javax.persistence.Column(name = "LastName", nullable = false) - public java.lang.String getLastName() { - return this.LastName; - } - - public void setLastName(java.lang.String LastName) { - this.LastName = LastName; - } - - @javax.persistence.Column(name = "TelephoneNumber") - public java.lang.String getTelephoneNumber() { - return this.TelephoneNumber; - } - - public void setTelephoneNumber(java.lang.String TelephoneNumber) { - this.TelephoneNumber = TelephoneNumber; - } - - @javax.persistence.Column(name = "TelephoneSpecialInstructions") - public java.lang.String getTelephoneSpecialInstructions() { - return this.TelephoneSpecialInstructions; - } - - public void setTelephoneSpecialInstructions(java.lang.String TelephoneSpecialInstructions) { - this.TelephoneSpecialInstructions = TelephoneSpecialInstructions; - } - - @javax.persistence.Column(name = "Street") - public java.lang.String getStreet() { - return this.Street; - } - - public void setStreet(java.lang.String Street) { - this.Street = Street; - } - - @javax.persistence.Column(name = "City") - public java.lang.String getCity() { - return this.City; - } - - public void setCity(java.lang.String City) { - this.City = City; - } - - @javax.persistence.Column(name = "StateProvince") - public java.lang.String getStateProvince() { - return this.StateProvince; - } - - public void setStateProvince(java.lang.String StateProvince) { - this.StateProvince = StateProvince; - } - - @javax.persistence.Column(name = "PostalCode") - public java.lang.String getPostalCode() { - return this.PostalCode; - } - - public void setPostalCode(java.lang.String PostalCode) { - this.PostalCode = PostalCode; - } - - @javax.persistence.Column(name = "CountryRegion") - public java.lang.String getCountryRegion() { - return this.CountryRegion; - } - - public void setCountryRegion(java.lang.String CountryRegion) { - this.CountryRegion = CountryRegion; - } - - @javax.persistence.Column(name = "HomeAddressSpecialInstructions") - public java.lang.String getHomeAddressSpecialInstructions() { - return this.HomeAddressSpecialInstructions; - } - - public void setHomeAddressSpecialInstructions(java.lang.String HomeAddressSpecialInstructions) { - this.HomeAddressSpecialInstructions = HomeAddressSpecialInstructions; - } - - @javax.persistence.Column(name = "EMailAddress") - public java.lang.String getEMailAddress() { - return this.EMailAddress; - } - - public void setEMailAddress(java.lang.String EMailAddress) { - this.EMailAddress = EMailAddress; - } - - @javax.persistence.Column(name = "EMailSpecialInstructions") - public java.lang.String getEMailSpecialInstructions() { - return this.EMailSpecialInstructions; - } - - public void setEMailSpecialInstructions(java.lang.String EMailSpecialInstructions) { - this.EMailSpecialInstructions = EMailSpecialInstructions; - } - - @javax.persistence.Column(name = "EMailTelephoneNumber") - public java.lang.String getEMailTelephoneNumber() { - return this.EMailTelephoneNumber; - } - - public void setEMailTelephoneNumber(java.lang.String EMailTelephoneNumber) { - this.EMailTelephoneNumber = EMailTelephoneNumber; - } - - @javax.persistence.Column(name = "rowguid", nullable = false) - public java.lang.String getrowguid() { - return this.rowguid; - } - - public void setrowguid(java.lang.String rowguid) { - this.rowguid = rowguid; - } - - @javax.persistence.Column(name = "ModifiedDate", nullable = false) - public java.sql.Timestamp getModifiedDate() { - return this.ModifiedDate; - } - - public void setModifiedDate(java.sql.Timestamp ModifiedDate) { - this.ModifiedDate = ModifiedDate; - } -} diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vstateprovincecountryregion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vstateprovincecountryregion.java deleted file mode 100644 index 91f8f9e00c..0000000000 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Vstateprovincecountryregion.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * This class is generated by jOOQ - */ -package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos; - -/** - * This class is generated by jOOQ. - */ -@javax.persistence.Entity -@javax.persistence.Table(name = "vStateProvinceCountryRegion", schema = "Person") -public class vStateProvinceCountryRegion implements java.io.Serializable { - - private static final long serialVersionUID = 1854848768; - - private java.lang.Integer StateProvinceID; - private java.lang.String StateProvinceCode; - private java.lang.Boolean IsOnlyStateProvinceFlag; - private java.lang.String StateProvinceName; - private java.lang.Integer TerritoryID; - private java.lang.String CountryRegionCode; - private java.lang.String CountryRegionName; - - @javax.persistence.Column(name = "StateProvinceID", nullable = false) - public java.lang.Integer getStateProvinceID() { - return this.StateProvinceID; - } - - public void setStateProvinceID(java.lang.Integer StateProvinceID) { - this.StateProvinceID = StateProvinceID; - } - - @javax.persistence.Column(name = "StateProvinceCode", nullable = false) - public java.lang.String getStateProvinceCode() { - return this.StateProvinceCode; - } - - public void setStateProvinceCode(java.lang.String StateProvinceCode) { - this.StateProvinceCode = StateProvinceCode; - } - - @javax.persistence.Column(name = "IsOnlyStateProvinceFlag", nullable = false) - public java.lang.Boolean getIsOnlyStateProvinceFlag() { - return this.IsOnlyStateProvinceFlag; - } - - public void setIsOnlyStateProvinceFlag(java.lang.Boolean IsOnlyStateProvinceFlag) { - this.IsOnlyStateProvinceFlag = IsOnlyStateProvinceFlag; - } - - @javax.persistence.Column(name = "StateProvinceName", nullable = false) - public java.lang.String getStateProvinceName() { - return this.StateProvinceName; - } - - public void setStateProvinceName(java.lang.String StateProvinceName) { - this.StateProvinceName = StateProvinceName; - } - - @javax.persistence.Column(name = "TerritoryID", nullable = false) - public java.lang.Integer getTerritoryID() { - return this.TerritoryID; - } - - public void setTerritoryID(java.lang.Integer TerritoryID) { - this.TerritoryID = TerritoryID; - } - - @javax.persistence.Column(name = "CountryRegionCode", nullable = false) - public java.lang.String getCountryRegionCode() { - return this.CountryRegionCode; - } - - public void setCountryRegionCode(java.lang.String CountryRegionCode) { - this.CountryRegionCode = CountryRegionCode; - } - - @javax.persistence.Column(name = "CountryRegionName", nullable = false) - public java.lang.String getCountryRegionName() { - return this.CountryRegionName; - } - - public void setCountryRegionName(java.lang.String CountryRegionName) { - this.CountryRegionName = CountryRegionName; - } -}