From 08998bc4e38c07222f0d995824d576a4b424ed6b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 26 Apr 2013 15:54:19 +0200
Subject: Add support for table options in changelog, use to handle MySQL
 engine

---
 common/changelog/add-column-mysql-diff.xml        | 2 +-
 common/changelog/add-column-mysql-patch.xml       | 2 +-
 common/changelog/add-foreign-key-mysql-diff.xml   | 4 ++--
 common/changelog/add-foreign-key-mysql-patch.xml  | 4 ++--
 common/changelog/add-index-mysql-diff.xml         | 2 +-
 common/changelog/add-index-mysql-patch.xml        | 2 +-
 common/changelog/add-table-mysql-diff.xml         | 6 +++---
 common/changelog/add-table-mysql-patch.xml        | 6 +++---
 common/changelog/alter-column-mysql-diff.xml      | 2 +-
 common/changelog/alter-column-mysql-patch.xml     | 2 +-
 common/changelog/drop-column-mysql-diff.xml       | 2 +-
 common/changelog/drop-column-mysql-patch.xml      | 2 +-
 common/changelog/drop-foreign-key-mysql-diff.xml  | 4 ++--
 common/changelog/drop-foreign-key-mysql-patch.xml | 4 ++--
 common/changelog/drop-index-mysql-diff.xml        | 2 +-
 common/changelog/drop-index-mysql-patch.xml       | 2 +-
 common/changelog/drop-table-mysql-diff.xml        | 6 +++---
 common/changelog/drop-table-mysql-patch.xml       | 2 +-
 common/changelog/model-mysql.xml                  | 6 +++---
 19 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/common/changelog/add-column-mysql-diff.xml b/common/changelog/add-column-mysql-diff.xml
index 4d37d92..15ff759 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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 0d58e11..445ad0d 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/add-foreign-key-mysql-diff.xml b/common/changelog/add-foreign-key-mysql-diff.xml
index 6657898..44aa42e 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" options="ENGINE=InnoDB">
       <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 b4d2f48..fa21c84 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/add-index-mysql-diff.xml b/common/changelog/add-index-mysql-diff.xml
index 48a6062..5abe640 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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 e617c26..dec530a 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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-table-mysql-diff.xml b/common/changelog/add-table-mysql-diff.xml
index 19bca23..f899cb2 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">
+    <add-table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -14,7 +14,7 @@
         </references>
       </foreign-key>
     </add-table>
-    <add-table name="object_nums">
+    <add-table name="object_nums" options="ENGINE=InnoDB">
       <column name="object_id" type="INT" null="false"/>
       <column name="index" type="BIGINT UNSIGNED" null="false"/>
       <column name="value" type="INT" null="false"/>
@@ -34,7 +34,7 @@
   </changeset>
 
   <model version="1">
-    <table name="object1">
+    <table name="object1" options="ENGINE=InnoDB">
       <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 5178d70..4d0af47 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">
+    <table name="object1" options="ENGINE=InnoDB">
       <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" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -21,7 +21,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object_nums">
+    <table name="object_nums" options="ENGINE=InnoDB">
       <column name="object_id" type="INT" null="false"/>
       <column name="index" type="BIGINT UNSIGNED" null="false"/>
       <column name="value" type="INT" null="false"/>
diff --git a/common/changelog/alter-column-mysql-diff.xml b/common/changelog/alter-column-mysql-diff.xml
index 6b7d024..5f964fd 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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 702d928..3987abf 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="true"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-column-mysql-diff.xml b/common/changelog/drop-column-mysql-diff.xml
index b1b6abb..7b6d172 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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 024d4b8..f69268d 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
diff --git a/common/changelog/drop-foreign-key-mysql-diff.xml b/common/changelog/drop-foreign-key-mysql-diff.xml
index 6ddc103..137f05f 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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" options="ENGINE=InnoDB">
       <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 c5fb28e..d690c42 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <primary-key auto="true">
         <column name="id"/>
       </primary-key>
     </table>
-    <table name="object1">
+    <table name="object1" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <primary-key>
         <column name="id"/>
diff --git a/common/changelog/drop-index-mysql-diff.xml b/common/changelog/drop-index-mysql-diff.xml
index 7688aa1..c944e40 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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 0d58e11..445ad0d 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key auto="true">
diff --git a/common/changelog/drop-table-mysql-diff.xml b/common/changelog/drop-table-mysql-diff.xml
index 218adca..5fd5a97 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">
+    <table name="object" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <column name="o1" type="INT" null="true"/>
@@ -19,7 +19,7 @@
         </references>
       </foreign-key>
     </table>
-    <table name="object_nums">
+    <table name="object_nums" options="ENGINE=InnoDB">
       <column name="object_id" type="INT" null="false"/>
       <column name="index" type="BIGINT UNSIGNED" null="false"/>
       <column name="value" type="INT" null="false"/>
@@ -36,7 +36,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" options="ENGINE=InnoDB">
       <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 d6db3ae..a6778df 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">
+    <table name="object1" options="ENGINE=InnoDB">
       <column name="id" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
       <primary-key>
diff --git a/common/changelog/model-mysql.xml b/common/changelog/model-mysql.xml
index 054e9fb..9398955 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">
+    <table name="object" options="ENGINE=InnoDB">
       <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"/>
@@ -26,7 +26,7 @@
         <column name="v_y"/>
       </index>
     </table>
-    <table name="object_nums">
+    <table name="object_nums" options="ENGINE=InnoDB">
       <column name="object_id" type="INT" null="false"/>
       <column name="index" type="BIGINT UNSIGNED" null="false"/>
       <column name="value" type="INT" null="false"/>
@@ -43,7 +43,7 @@
         <column name="index"/>
       </index>
     </table>
-    <table name="object1">
+    <table name="object1" options="ENGINE=InnoDB">
       <column name="id_x" type="INT" null="false"/>
       <column name="id_y" type="INT" null="false"/>
       <column name="num" type="INT" null="false"/>
-- 
cgit v1.1