This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push: new ec1a16f67 Update generated tables new 71c8a6ce5 Merge pull request #570 from m-dzianishchyts/update-generated-tables ec1a16f67 is described below commit ec1a16f6789ba4530333056300ad0f602dac6ad1 Author: Mikhail Dzianishchyts <mikhail.dzianishch...@gmail.com> AuthorDate: Fri Feb 24 18:43:59 2023 +0300 Update generated tables --- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java | 4 ++-- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java | 4 ++-- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java | 4 ++-- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java | 4 ++-- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java | 4 ++-- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java | 4 ++-- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java | 3 ++- .../src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java index 5f769c951..3bff928d7 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table1.java @@ -8,11 +8,11 @@ import java.util.List; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table1; import org.apache.cayenne.crypto.db.Table7; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.ListProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.NumericProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; import org.apache.cayenne.exp.property.StringProperty; /** @@ -25,7 +25,7 @@ public abstract class _Table1 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table1> SELF = PropertyFactory.createSelf(Table1.class); + public static final SelfProperty<Table1> SELF = PropertyFactory.createSelf(Table1.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table1", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java index 7ccd3e5d9..f8f0272a7 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table2.java @@ -7,9 +7,9 @@ import java.io.ObjectOutputStream; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table2; import org.apache.cayenne.exp.property.BaseProperty; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; /** * Class _Table2 was generated by Cayenne. @@ -21,7 +21,7 @@ public abstract class _Table2 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table2> SELF = PropertyFactory.createSelf(Table2.class); + public static final SelfProperty<Table2> SELF = PropertyFactory.createSelf(Table2.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table2", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java index bc9e6957f..c01e383f4 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table3.java @@ -6,9 +6,9 @@ import java.io.ObjectOutputStream; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table3; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; import org.apache.cayenne.exp.property.StringProperty; /** @@ -21,7 +21,7 @@ public abstract class _Table3 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table3> SELF = PropertyFactory.createSelf(Table3.class); + public static final SelfProperty<Table3> SELF = PropertyFactory.createSelf(Table3.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table3", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java index 862d1105f..591f439f0 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table4.java @@ -6,10 +6,10 @@ import java.io.ObjectOutputStream; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table4; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.NumericProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; import org.apache.cayenne.exp.property.StringProperty; /** @@ -22,7 +22,7 @@ public abstract class _Table4 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table4> SELF = PropertyFactory.createSelf(Table4.class); + public static final SelfProperty<Table4> SELF = PropertyFactory.createSelf(Table4.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table4", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java index f5cd4d8bf..b12bd98e9 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table5.java @@ -6,10 +6,10 @@ import java.io.ObjectOutputStream; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table5; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.NumericProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; /** * Class _Table5 was generated by Cayenne. @@ -21,7 +21,7 @@ public abstract class _Table5 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table5> SELF = PropertyFactory.createSelf(Table5.class); + public static final SelfProperty<Table5> SELF = PropertyFactory.createSelf(Table5.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table5", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java index 9404fd8a5..b925ff74a 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table6.java @@ -6,10 +6,10 @@ import java.io.ObjectOutputStream; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table6; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.NumericProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; /** * Class _Table6 was generated by Cayenne. @@ -21,7 +21,7 @@ public abstract class _Table6 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table6> SELF = PropertyFactory.createSelf(Table6.class); + public static final SelfProperty<Table6> SELF = PropertyFactory.createSelf(Table6.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table6", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java index ef0cc9e27..11141ab94 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table7.java @@ -11,6 +11,7 @@ import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.NumericProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; import org.apache.cayenne.exp.property.StringProperty; /** @@ -23,7 +24,7 @@ public abstract class _Table7 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table7> SELF = PropertyFactory.createSelf(Table7.class); + public static final SelfProperty<Table7> SELF = PropertyFactory.createSelf(Table7.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table7", Integer.class); public static final String ID_PK_COLUMN = "ID"; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java index 1003a6fbe..cc632f960 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/db/auto/_Table8.java @@ -6,9 +6,9 @@ import java.io.ObjectOutputStream; import org.apache.cayenne.BaseDataObject; import org.apache.cayenne.crypto.db.Table8; -import org.apache.cayenne.exp.property.EntityProperty; import org.apache.cayenne.exp.property.NumericIdProperty; import org.apache.cayenne.exp.property.PropertyFactory; +import org.apache.cayenne.exp.property.SelfProperty; import org.apache.cayenne.exp.property.StringProperty; /** @@ -21,7 +21,7 @@ public abstract class _Table8 extends BaseDataObject { private static final long serialVersionUID = 1L; - public static final EntityProperty<Table8> SELF = PropertyFactory.createSelf(Table8.class); + public static final SelfProperty<Table8> SELF = PropertyFactory.createSelf(Table8.class); public static final NumericIdProperty<Integer> ID_PK_PROPERTY = PropertyFactory.createNumericId("ID", "Table8", Integer.class); public static final String ID_PK_COLUMN = "ID";