Diagnose change of polymorphic base, table kind

96 files changed, 137 insertions, 137 deletions

diff --git a/common/changelog/add-column-mssql-diff.xml b/common/changelog/add-column-mssql-diff.xml
index 7294eb8..4f9ba09 100644
--- a/common/changelog/add-column-mssql-diff.xml
+++ b/common/changelog/add-column-mssql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/add-column-mssql-patch.xml b/common/changelog/add-column-mssql-patch.xml
index cea9815..7054935 100644
--- a/common/changelog/add-column-mssql-patch.xml
+++ b/common/changelog/add-column-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-column-mysql-diff.xml b/common/changelog/add-column-mysql-diff.xml
index 15ff759..992306d 100644
--- a/common/changelog/add-column-mysql-diff.xml
+++ b/common/changelog/add-column-mysql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/add-column-mysql-patch.xml b/common/changelog/add-column-mysql-patch.xml
index 445ad0d..e2143eb 100644
--- a/common/changelog/add-column-mysql-patch.xml
+++ b/common/changelog/add-column-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-column-oracle-diff.xml b/common/changelog/add-column-oracle-diff.xml
index 3ebaa7b..fa1dac6 100644
--- a/common/changelog/add-column-oracle-diff.xml
+++ b/common/changelog/add-column-oracle-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
diff --git a/common/changelog/add-column-oracle-patch.xml b/common/changelog/add-column-oracle-patch.xml
index b934c83..96da076 100644
--- a/common/changelog/add-column-oracle-patch.xml
+++ b/common/changelog/add-column-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/add-column-pgsql-diff.xml b/common/changelog/add-column-pgsql-diff.xml
index b72aced..9524d9d 100644
--- a/common/changelog/add-column-pgsql-diff.xml
+++ b/common/changelog/add-column-pgsql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/add-column-pgsql-patch.xml b/common/changelog/add-column-pgsql-patch.xml
index a6ce808..1e73c14 100644
--- a/common/changelog/add-column-pgsql-patch.xml
+++ b/common/changelog/add-column-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-column-sqlite-diff.xml b/common/changelog/add-column-sqlite-diff.xml
index 2f32915..b59cc72 100644
--- a/common/changelog/add-column-sqlite-diff.xml
+++ b/common/changelog/add-column-sqlite-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/add-column-sqlite-patch.xml b/common/changelog/add-column-sqlite-patch.xml
index 8f80bfc..a0e37a4 100644
--- a/common/changelog/add-column-sqlite-patch.xml
+++ b/common/changelog/add-column-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-foreign-key-diff.xml b/common/changelog/add-foreign-key-diff.xml
index 06079b8..d4f29ad 100644
--- a/common/changelog/add-foreign-key-diff.xml
+++ b/common/changelog/add-foreign-key-diff.xml
@@ -12,13 +12,13 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mssql-diff.xml b/common/changelog/add-foreign-key-mssql-diff.xml
index ce050d6..76ebce3 100644
--- a/common/changelog/add-foreign-key-mssql-diff.xml
+++ b/common/changelog/add-foreign-key-mssql-diff.xml
@@ -12,13 +12,13 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mssql-patch.xml b/common/changelog/add-foreign-key-mssql-patch.xml
index 833687c..1f1f30f 100644
--- a/common/changelog/add-foreign-key-mssql-patch.xml
+++ b/common/changelog/add-foreign-key-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
       <primary-key auto="true">
@@ -13,7 +13,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mysql-diff.xml b/common/changelog/add-foreign-key-mysql-diff.xml
index 44aa42e..acdfd5b 100644
--- a/common/changelog/add-foreign-key-mysql-diff.xml
+++ b/common/changelog/add-foreign-key-mysql-diff.xml
@@ -12,13 +12,13 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-mysql-patch.xml b/common/changelog/add-foreign-key-mysql-patch.xml
index fa21c84..635d3c3 100644
--- a/common/changelog/add-foreign-key-mysql-patch.xml
+++ b/common/changelog/add-foreign-key-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
       <primary-key auto="true">
@@ -13,7 +13,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-oracle-diff.xml b/common/changelog/add-foreign-key-oracle-diff.xml
index 75bcbe2..6bd8bc3 100644
--- a/common/changelog/add-foreign-key-oracle-diff.xml
+++ b/common/changelog/add-foreign-key-oracle-diff.xml
@@ -12,13 +12,13 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-oracle-patch.xml b/common/changelog/add-foreign-key-oracle-patch.xml
index fcadec0..631c8b5 100644
--- a/common/changelog/add-foreign-key-oracle-patch.xml
+++ b/common/changelog/add-foreign-key-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
       <primary-key auto="true" sequence="object_seq">
@@ -13,7 +13,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-pgsql-diff.xml b/common/changelog/add-foreign-key-pgsql-diff.xml
index e14cf32..793b009 100644
--- a/common/changelog/add-foreign-key-pgsql-diff.xml
+++ b/common/changelog/add-foreign-key-pgsql-diff.xml
@@ -12,13 +12,13 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-pgsql-patch.xml b/common/changelog/add-foreign-key-pgsql-patch.xml
index e70d737..04617fd 100644
--- a/common/changelog/add-foreign-key-pgsql-patch.xml
+++ b/common/changelog/add-foreign-key-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
       <primary-key auto="true">
@@ -13,7 +13,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-sqlite-diff.xml b/common/changelog/add-foreign-key-sqlite-diff.xml
index dece240..1510470 100644
--- a/common/changelog/add-foreign-key-sqlite-diff.xml
+++ b/common/changelog/add-foreign-key-sqlite-diff.xml
@@ -12,13 +12,13 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-foreign-key-sqlite-patch.xml b/common/changelog/add-foreign-key-sqlite-patch.xml
index 5bc48d5..5a32496 100644
--- a/common/changelog/add-foreign-key-sqlite-patch.xml
+++ b/common/changelog/add-foreign-key-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
       <primary-key auto="true">
@@ -13,7 +13,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-index-mssql-diff.xml b/common/changelog/add-index-mssql-diff.xml
index 47ca82d..58c623f 100644
--- a/common/changelog/add-index-mssql-diff.xml
+++ b/common/changelog/add-index-mssql-diff.xml
@@ -10,7 +10,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="x" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-index-mssql-patch.xml b/common/changelog/add-index-mssql-patch.xml
index 5f41f15..6085d04 100644
--- a/common/changelog/add-index-mssql-patch.xml
+++ b/common/changelog/add-index-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="x" type="INT" null="false"/>
       <column name="y" type="INT" null="false"/>
diff --git a/common/changelog/add-index-mysql-diff.xml b/common/changelog/add-index-mysql-diff.xml
index 5abe640..a54a7e3 100644
--- a/common/changelog/add-index-mysql-diff.xml
+++ b/common/changelog/add-index-mysql-diff.xml
@@ -10,7 +10,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="x" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-index-mysql-patch.xml b/common/changelog/add-index-mysql-patch.xml
index dec530a..b7e2409 100644
--- a/common/changelog/add-index-mysql-patch.xml
+++ b/common/changelog/add-index-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="x" type="INT" null="false"/>
       <column name="y" type="INT" null="false"/>
diff --git a/common/changelog/add-index-oracle-diff.xml b/common/changelog/add-index-oracle-diff.xml
index 4f1afbe..80f8ecc 100644
--- a/common/changelog/add-index-oracle-diff.xml
+++ b/common/changelog/add-index-oracle-diff.xml
@@ -10,7 +10,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="x" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/add-index-oracle-patch.xml b/common/changelog/add-index-oracle-patch.xml
index 9ceb77a..3727521 100644
--- a/common/changelog/add-index-oracle-patch.xml
+++ b/common/changelog/add-index-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="x" type="NUMBER(10)" null="false"/>
       <column name="y" type="NUMBER(10)" null="false"/>
diff --git a/common/changelog/add-index-pgsql-diff.xml b/common/changelog/add-index-pgsql-diff.xml
index 8030b25..3988643 100644
--- a/common/changelog/add-index-pgsql-diff.xml
+++ b/common/changelog/add-index-pgsql-diff.xml
@@ -10,7 +10,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="x" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-index-pgsql-patch.xml b/common/changelog/add-index-pgsql-patch.xml
index f42d591..59ec932 100644
--- a/common/changelog/add-index-pgsql-patch.xml
+++ b/common/changelog/add-index-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="x" type="INTEGER" null="false"/>
       <column name="y" type="INTEGER" null="false"/>
diff --git a/common/changelog/add-index-sqlite-diff.xml b/common/changelog/add-index-sqlite-diff.xml
index fc8fb44..c1f7fdc 100644
--- a/common/changelog/add-index-sqlite-diff.xml
+++ b/common/changelog/add-index-sqlite-diff.xml
@@ -10,7 +10,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="x" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-index-sqlite-patch.xml b/common/changelog/add-index-sqlite-patch.xml
index effbe72..798fa73 100644
--- a/common/changelog/add-index-sqlite-patch.xml
+++ b/common/changelog/add-index-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="x" type="INTEGER" null="false"/>
       <column name="y" type="INTEGER" null="false"/>
diff --git a/common/changelog/add-table-mssql-diff.xml b/common/changelog/add-table-mssql-diff.xml
index 5468cc9..8bf0e30 100644
--- a/common/changelog/add-table-mssql-diff.xml
+++ b/common/changelog/add-table-mssql-diff.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <changeset version="2">
-    <add-table name="object">
+    <add-table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -34,7 +34,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/add-table-mssql-patch.xml b/common/changelog/add-table-mssql-patch.xml
index 1b62efc..0f09e2b 100644
--- a/common/changelog/add-table-mssql-patch.xml
+++ b/common/changelog/add-table-mssql-patch.xml
@@ -1,13 +1,13 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
diff --git a/common/changelog/add-table-mysql-diff.xml b/common/changelog/add-table-mysql-diff.xml
index bbe5a1f..57f741b 100644
--- a/common/changelog/add-table-mysql-diff.xml
+++ b/common/changelog/add-table-mysql-diff.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <changeset version="2">
-    <add-table name="object" options="ENGINE=InnoDB">
+    <add-table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -34,7 +34,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/add-table-mysql-patch.xml b/common/changelog/add-table-mysql-patch.xml
index 199cf19..f2a02cf 100644
--- a/common/changelog/add-table-mysql-patch.xml
+++ b/common/changelog/add-table-mysql-patch.xml
@@ -1,13 +1,13 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
diff --git a/common/changelog/add-table-oracle-diff.xml b/common/changelog/add-table-oracle-diff.xml
index e7fd0fd..70ec7c6 100644
--- a/common/changelog/add-table-oracle-diff.xml
+++ b/common/changelog/add-table-oracle-diff.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <changeset version="2">
-    <add-table name="object">
+    <add-table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
@@ -34,7 +34,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key>
diff --git a/common/changelog/add-table-oracle-patch.xml b/common/changelog/add-table-oracle-patch.xml
index 5c6c766..67ffc15 100644
--- a/common/changelog/add-table-oracle-patch.xml
+++ b/common/changelog/add-table-oracle-patch.xml
@@ -1,13 +1,13 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key>
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
diff --git a/common/changelog/add-table-pgsql-diff.xml b/common/changelog/add-table-pgsql-diff.xml
index 5c96338..9b48062 100644
--- a/common/changelog/add-table-pgsql-diff.xml
+++ b/common/changelog/add-table-pgsql-diff.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <changeset version="2">
-    <add-table name="object">
+    <add-table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
@@ -34,7 +34,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
diff --git a/common/changelog/add-table-pgsql-patch.xml b/common/changelog/add-table-pgsql-patch.xml
index 8c8d7d3..4a9bc8b 100644
--- a/common/changelog/add-table-pgsql-patch.xml
+++ b/common/changelog/add-table-pgsql-patch.xml
@@ -1,13 +1,13 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
diff --git a/common/changelog/add-table-sqlite-diff.xml b/common/changelog/add-table-sqlite-diff.xml
index 44ca569..573bc69 100644
--- a/common/changelog/add-table-sqlite-diff.xml
+++ b/common/changelog/add-table-sqlite-diff.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <changeset version="2">
-    <add-table name="object">
+    <add-table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
@@ -34,7 +34,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
diff --git a/common/changelog/add-table-sqlite-patch.xml b/common/changelog/add-table-sqlite-patch.xml
index 9eb4a3b..a62c530 100644
--- a/common/changelog/add-table-sqlite-patch.xml
+++ b/common/changelog/add-table-sqlite-patch.xml
@@ -1,13 +1,13 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
diff --git a/common/changelog/alter-column-mssql-diff.xml b/common/changelog/alter-column-mssql-diff.xml
index 05515d5..6c1fb6a 100644
--- a/common/changelog/alter-column-mssql-diff.xml
+++ b/common/changelog/alter-column-mssql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-mssql-patch.xml b/common/changelog/alter-column-mssql-patch.xml
index 04bee32..f988693 100644
--- a/common/changelog/alter-column-mssql-patch.xml
+++ b/common/changelog/alter-column-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="true"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-mysql-diff.xml b/common/changelog/alter-column-mysql-diff.xml
index 5f964fd..39ad6ef 100644
--- a/common/changelog/alter-column-mysql-diff.xml
+++ b/common/changelog/alter-column-mysql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-mysql-patch.xml b/common/changelog/alter-column-mysql-patch.xml
index 3987abf..53bf586 100644
--- a/common/changelog/alter-column-mysql-patch.xml
+++ b/common/changelog/alter-column-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="true"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-oracle-diff.xml b/common/changelog/alter-column-oracle-diff.xml
index d49ea52..d41d333 100644
--- a/common/changelog/alter-column-oracle-diff.xml
+++ b/common/changelog/alter-column-oracle-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/alter-column-oracle-patch.xml b/common/changelog/alter-column-oracle-patch.xml
index 0f48155..342436b 100644
--- a/common/changelog/alter-column-oracle-patch.xml
+++ b/common/changelog/alter-column-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="true"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/alter-column-pgsql-diff.xml b/common/changelog/alter-column-pgsql-diff.xml
index 6b0c284..fd97fa0 100644
--- a/common/changelog/alter-column-pgsql-diff.xml
+++ b/common/changelog/alter-column-pgsql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-pgsql-patch.xml b/common/changelog/alter-column-pgsql-patch.xml
index a615303..efbd7c5 100644
--- a/common/changelog/alter-column-pgsql-patch.xml
+++ b/common/changelog/alter-column-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="true"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-sqlite-diff.xml b/common/changelog/alter-column-sqlite-diff.xml
index 26c7cb6..7ecea06 100644
--- a/common/changelog/alter-column-sqlite-diff.xml
+++ b/common/changelog/alter-column-sqlite-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/alter-column-sqlite-patch.xml b/common/changelog/alter-column-sqlite-patch.xml
index ac6ccf1..294e591 100644
--- a/common/changelog/alter-column-sqlite-patch.xml
+++ b/common/changelog/alter-column-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="true"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-column-mssql-diff.xml b/common/changelog/drop-column-mssql-diff.xml
index 1b2c433..f2bab96 100644
--- a/common/changelog/drop-column-mssql-diff.xml
+++ b/common/changelog/drop-column-mssql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-column-mssql-patch.xml b/common/changelog/drop-column-mssql-patch.xml
index 13b4d50..3dea777 100644
--- a/common/changelog/drop-column-mssql-patch.xml
+++ b/common/changelog/drop-column-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/drop-column-mysql-diff.xml b/common/changelog/drop-column-mysql-diff.xml
index 7b6d172..2bb321d 100644
--- a/common/changelog/drop-column-mysql-diff.xml
+++ b/common/changelog/drop-column-mysql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-column-mysql-patch.xml b/common/changelog/drop-column-mysql-patch.xml
index f69268d..43255a3 100644
--- a/common/changelog/drop-column-mysql-patch.xml
+++ b/common/changelog/drop-column-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/drop-column-oracle-diff.xml b/common/changelog/drop-column-oracle-diff.xml
index 5109339..e920a12 100644
--- a/common/changelog/drop-column-oracle-diff.xml
+++ b/common/changelog/drop-column-oracle-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/drop-column-oracle-patch.xml b/common/changelog/drop-column-oracle-patch.xml
index 18e5dee..bded324 100644
--- a/common/changelog/drop-column-oracle-patch.xml
+++ b/common/changelog/drop-column-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
diff --git a/common/changelog/drop-column-pgsql-diff.xml b/common/changelog/drop-column-pgsql-diff.xml
index 45bd5ff..d2e91ba 100644
--- a/common/changelog/drop-column-pgsql-diff.xml
+++ b/common/changelog/drop-column-pgsql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-column-pgsql-patch.xml b/common/changelog/drop-column-pgsql-patch.xml
index 2c89e9c..1bc92ce 100644
--- a/common/changelog/drop-column-pgsql-patch.xml
+++ b/common/changelog/drop-column-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/drop-column-sqlite-diff.xml b/common/changelog/drop-column-sqlite-diff.xml
index 9ed1245..1c9d138 100644
--- a/common/changelog/drop-column-sqlite-diff.xml
+++ b/common/changelog/drop-column-sqlite-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-column-sqlite-patch.xml b/common/changelog/drop-column-sqlite-patch.xml
index cc3f86c..9878a76 100644
--- a/common/changelog/drop-column-sqlite-patch.xml
+++ b/common/changelog/drop-column-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mssql-diff.xml b/common/changelog/drop-foreign-key-mssql-diff.xml
index d110266..da3ce73 100644
--- a/common/changelog/drop-foreign-key-mssql-diff.xml
+++ b/common/changelog/drop-foreign-key-mssql-diff.xml
@@ -7,7 +7,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
       <primary-key auto="true">
@@ -20,7 +20,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mssql-patch.xml b/common/changelog/drop-foreign-key-mssql-patch.xml
index 84af5fe..809a01f 100644
--- a/common/changelog/drop-foreign-key-mssql-patch.xml
+++ b/common/changelog/drop-foreign-key-mssql-patch.xml
@@ -1,12 +1,12 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mysql-diff.xml b/common/changelog/drop-foreign-key-mysql-diff.xml
index 137f05f..aa179f2 100644
--- a/common/changelog/drop-foreign-key-mysql-diff.xml
+++ b/common/changelog/drop-foreign-key-mysql-diff.xml
@@ -7,7 +7,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
       <primary-key auto="true">
@@ -20,7 +20,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mysql-patch.xml b/common/changelog/drop-foreign-key-mysql-patch.xml
index d690c42..d55adeb 100644
--- a/common/changelog/drop-foreign-key-mysql-patch.xml
+++ b/common/changelog/drop-foreign-key-mysql-patch.xml
@@ -1,12 +1,12 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-oracle-diff.xml b/common/changelog/drop-foreign-key-oracle-diff.xml
index 5203218..aa407d3 100644
--- a/common/changelog/drop-foreign-key-oracle-diff.xml
+++ b/common/changelog/drop-foreign-key-oracle-diff.xml
@@ -7,7 +7,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
       <primary-key auto="true" sequence="object_seq">
@@ -20,7 +20,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-oracle-patch.xml b/common/changelog/drop-foreign-key-oracle-patch.xml
index e44645b..68bb19f 100644
--- a/common/changelog/drop-foreign-key-oracle-patch.xml
+++ b/common/changelog/drop-foreign-key-oracle-patch.xml
@@ -1,12 +1,12 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-pgsql-diff.xml b/common/changelog/drop-foreign-key-pgsql-diff.xml
index 9d0c7c1..9a6259a 100644
--- a/common/changelog/drop-foreign-key-pgsql-diff.xml
+++ b/common/changelog/drop-foreign-key-pgsql-diff.xml
@@ -7,7 +7,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
       <primary-key auto="true">
@@ -20,7 +20,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-pgsql-patch.xml b/common/changelog/drop-foreign-key-pgsql-patch.xml
index 14844d3..2fb6f17 100644
--- a/common/changelog/drop-foreign-key-pgsql-patch.xml
+++ b/common/changelog/drop-foreign-key-pgsql-patch.xml
@@ -1,12 +1,12 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-sqlite-diff.xml b/common/changelog/drop-foreign-key-sqlite-diff.xml
index af0f7bc..6f9f994 100644
--- a/common/changelog/drop-foreign-key-sqlite-diff.xml
+++ b/common/changelog/drop-foreign-key-sqlite-diff.xml
@@ -7,7 +7,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
       <primary-key auto="true">
@@ -20,7 +20,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-sqlite-patch.xml b/common/changelog/drop-foreign-key-sqlite-patch.xml
index e856d5d..95ee50e 100644
--- a/common/changelog/drop-foreign-key-sqlite-patch.xml
+++ b/common/changelog/drop-foreign-key-sqlite-patch.xml
@@ -1,12 +1,12 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-index-mssql-diff.xml b/common/changelog/drop-index-mssql-diff.xml
index cf68fd7..ac95db5 100644
--- a/common/changelog/drop-index-mssql-diff.xml
+++ b/common/changelog/drop-index-mssql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-mssql-patch.xml b/common/changelog/drop-index-mssql-patch.xml
index cea9815..7054935 100644
--- a/common/changelog/drop-index-mssql-patch.xml
+++ b/common/changelog/drop-index-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-mysql-diff.xml b/common/changelog/drop-index-mysql-diff.xml
index c944e40..f8c95ef 100644
--- a/common/changelog/drop-index-mysql-diff.xml
+++ b/common/changelog/drop-index-mysql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-mysql-patch.xml b/common/changelog/drop-index-mysql-patch.xml
index 445ad0d..e2143eb 100644
--- a/common/changelog/drop-index-mysql-patch.xml
+++ b/common/changelog/drop-index-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-oracle-diff.xml b/common/changelog/drop-index-oracle-diff.xml
index 2ed5e65..d174802 100644
--- a/common/changelog/drop-index-oracle-diff.xml
+++ b/common/changelog/drop-index-oracle-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/drop-index-oracle-patch.xml b/common/changelog/drop-index-oracle-patch.xml
index b934c83..96da076 100644
--- a/common/changelog/drop-index-oracle-patch.xml
+++ b/common/changelog/drop-index-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key auto="true" sequence="object_seq">
diff --git a/common/changelog/drop-index-pgsql-diff.xml b/common/changelog/drop-index-pgsql-diff.xml
index 6e1661f..375a3d8 100644
--- a/common/changelog/drop-index-pgsql-diff.xml
+++ b/common/changelog/drop-index-pgsql-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-pgsql-patch.xml b/common/changelog/drop-index-pgsql-patch.xml
index a6ce808..1e73c14 100644
--- a/common/changelog/drop-index-pgsql-patch.xml
+++ b/common/changelog/drop-index-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-sqlite-diff.xml b/common/changelog/drop-index-sqlite-diff.xml
index bbc1ae4..bf54f9d 100644
--- a/common/changelog/drop-index-sqlite-diff.xml
+++ b/common/changelog/drop-index-sqlite-diff.xml
@@ -6,7 +6,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-index-sqlite-patch.xml b/common/changelog/drop-index-sqlite-patch.xml
index 8f80bfc..a0e37a4 100644
--- a/common/changelog/drop-index-sqlite-patch.xml
+++ b/common/changelog/drop-index-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-table-mssql-diff.xml b/common/changelog/drop-table-mssql-diff.xml
index 535c3a2..399d8bc 100644
--- a/common/changelog/drop-table-mssql-diff.xml
+++ b/common/changelog/drop-table-mssql-diff.xml
@@ -5,7 +5,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -36,7 +36,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-mssql-patch.xml b/common/changelog/drop-table-mssql-patch.xml
index 225550a..a02274e 100644
--- a/common/changelog/drop-table-mssql-patch.xml
+++ b/common/changelog/drop-table-mssql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-mysql-diff.xml b/common/changelog/drop-table-mysql-diff.xml
index c94eee3..3ccd553 100644
--- a/common/changelog/drop-table-mysql-diff.xml
+++ b/common/changelog/drop-table-mysql-diff.xml
@@ -5,7 +5,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -36,7 +36,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-mysql-patch.xml b/common/changelog/drop-table-mysql-patch.xml
index a6778df..ff23cb7 100644
--- a/common/changelog/drop-table-mysql-patch.xml
+++ b/common/changelog/drop-table-mysql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="2">
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-oracle-diff.xml b/common/changelog/drop-table-oracle-diff.xml
index 4aa67e2..589d64b 100644
--- a/common/changelog/drop-table-oracle-diff.xml
+++ b/common/changelog/drop-table-oracle-diff.xml
@@ -5,7 +5,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
@@ -36,7 +36,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-oracle-patch.xml b/common/changelog/drop-table-oracle-patch.xml
index 7983066..bac18eb 100644
--- a/common/changelog/drop-table-oracle-patch.xml
+++ b/common/changelog/drop-table-oracle-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-pgsql-diff.xml b/common/changelog/drop-table-pgsql-diff.xml
index 8facd2d..168ec46 100644
--- a/common/changelog/drop-table-pgsql-diff.xml
+++ b/common/changelog/drop-table-pgsql-diff.xml
@@ -5,7 +5,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
@@ -36,7 +36,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-pgsql-patch.xml b/common/changelog/drop-table-pgsql-patch.xml
index 8574207..329145c 100644
--- a/common/changelog/drop-table-pgsql-patch.xml
+++ b/common/changelog/drop-table-pgsql-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-sqlite-diff.xml b/common/changelog/drop-table-sqlite-diff.xml
index 85bf64a..6a258c4 100644
--- a/common/changelog/drop-table-sqlite-diff.xml
+++ b/common/changelog/drop-table-sqlite-diff.xml
@@ -5,7 +5,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <column name="o1" type="INTEGER" null="true"/>
@@ -36,7 +36,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
diff --git a/common/changelog/drop-table-sqlite-patch.xml b/common/changelog/drop-table-sqlite-patch.xml
index b4bcaca..8b5609c 100644
--- a/common/changelog/drop-table-sqlite-patch.xml
+++ b/common/changelog/drop-table-sqlite-patch.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="2">
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
       <primary-key>
diff --git a/common/changelog/model-mssql.xml b/common/changelog/model-mssql.xml
index 9bd1e4a..509a210 100644
--- a/common/changelog/model-mssql.xml
+++ b/common/changelog/model-mssql.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mssql" version="1">
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="true" default="0" options="DUMMY=1"/>
       <column name="v_x" type="INT" null="false"/>
@@ -43,7 +43,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id_x" type="INT" null="false"/>
       <column name="id_y" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
diff --git a/common/changelog/model-mysql.xml b/common/changelog/model-mysql.xml
index b4b2e14..ffbcf8d 100644
--- a/common/changelog/model-mysql.xml
+++ b/common/changelog/model-mysql.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="mysql" version="1">
   <model version="1">
-    <table name="object" options="ENGINE=InnoDB">
+    <table name="object" options="ENGINE=InnoDB" kind="object">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="true" default="0" options="DUMMY=1"/>
       <column name="v_x" type="INT" null="false"/>
@@ -43,7 +43,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1" options="ENGINE=InnoDB">
+    <table name="object1" options="ENGINE=InnoDB" kind="object">
       <column name="id_x" type="INT" null="false"/>
       <column name="id_y" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
diff --git a/common/changelog/model-oracle.xml b/common/changelog/model-oracle.xml
index 1b4db54..1824690 100644
--- a/common/changelog/model-oracle.xml
+++ b/common/changelog/model-oracle.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="oracle" version="1">
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="true" default="0" options="DUMMY=1"/>
       <column name="v_x" type="NUMBER(10)" null="false"/>
@@ -43,7 +43,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id_x" type="NUMBER(10)" null="false"/>
       <column name="id_y" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
diff --git a/common/changelog/model-pgsql.xml b/common/changelog/model-pgsql.xml
index 050a7c5..13aee6b 100644
--- a/common/changelog/model-pgsql.xml
+++ b/common/changelog/model-pgsql.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" version="1">
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="true" default="0" options="DUMMY=1"/>
       <column name="v_x" type="INTEGER" null="false"/>
@@ -43,7 +43,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id_x" type="INTEGER" null="false"/>
       <column name="id_y" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>
diff --git a/common/changelog/model-sqlite.xml b/common/changelog/model-sqlite.xml
index e2cf7cf..d0199ed 100644
--- a/common/changelog/model-sqlite.xml
+++ b/common/changelog/model-sqlite.xml
@@ -1,6 +1,6 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1">
   <model version="1">
-    <table name="object">
+    <table name="object" kind="object">
       <column name="id" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="true" default="0" options="DUMMY=1"/>
       <column name="v_x" type="INTEGER" null="false"/>
@@ -43,7 +43,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" kind="object">
       <column name="id_x" type="INTEGER" null="false"/>
       <column name="id_y" type="INTEGER" null="false"/>
       <column name="num" type="INTEGER" null="false"/>