From 5ad792c3b4ee4d2cc558f320c0c26210e4fa31bf Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 26 Apr 2013 17:18:13 +0200
Subject: Add support for extra database info in primary key

Use that to handle Oracle sequence name and SQLite lax auto ids.
---
 common/changelog/add-column-oracle-diff.xml        | 2 +-
 common/changelog/add-column-oracle-patch.xml       | 2 +-
 common/changelog/add-foreign-key-oracle-diff.xml   | 2 +-
 common/changelog/add-foreign-key-oracle-patch.xml  | 2 +-
 common/changelog/add-index-oracle-diff.xml         | 2 +-
 common/changelog/add-index-oracle-patch.xml        | 2 +-
 common/changelog/add-table-oracle-diff.xml         | 2 +-
 common/changelog/add-table-oracle-patch.xml        | 2 +-
 common/changelog/alter-column-oracle-diff.xml      | 2 +-
 common/changelog/alter-column-oracle-patch.xml     | 2 +-
 common/changelog/drop-column-oracle-diff.xml       | 2 +-
 common/changelog/drop-column-oracle-patch.xml      | 2 +-
 common/changelog/drop-foreign-key-oracle-diff.xml  | 2 +-
 common/changelog/drop-foreign-key-oracle-patch.xml | 2 +-
 common/changelog/drop-index-oracle-diff.xml        | 2 +-
 common/changelog/drop-index-oracle-patch.xml       | 2 +-
 common/changelog/drop-table-oracle-diff.xml        | 2 +-
 common/changelog/model-oracle.xml                  | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/changelog/add-column-oracle-diff.xml b/common/changelog/add-column-oracle-diff.xml
index 122e5e1..3ebaa7b 100644
--- a/common/changelog/add-column-oracle-diff.xml
+++ b/common/changelog/add-column-oracle-diff.xml
@@ -8,7 +8,7 @@
   <model version="1">
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/add-column-oracle-patch.xml b/common/changelog/add-column-oracle-patch.xml
index 2d864a6..b934c83 100644
--- a/common/changelog/add-column-oracle-patch.xml
+++ b/common/changelog/add-column-oracle-patch.xml
@@ -3,7 +3,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/add-foreign-key-oracle-diff.xml b/common/changelog/add-foreign-key-oracle-diff.xml
index 22c687d..75bcbe2 100644
--- a/common/changelog/add-foreign-key-oracle-diff.xml
+++ b/common/changelog/add-foreign-key-oracle-diff.xml
@@ -14,7 +14,7 @@
   <model version="1">
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/add-foreign-key-oracle-patch.xml b/common/changelog/add-foreign-key-oracle-patch.xml
index c58f162..fcadec0 100644
--- a/common/changelog/add-foreign-key-oracle-patch.xml
+++ b/common/changelog/add-foreign-key-oracle-patch.xml
@@ -3,7 +3,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <foreign-key name="object_o1_fk" deferrable="DEFERRED">
diff --git a/common/changelog/add-index-oracle-diff.xml b/common/changelog/add-index-oracle-diff.xml
index 3a8cfc0..4f1afbe 100644
--- a/common/changelog/add-index-oracle-diff.xml
+++ b/common/changelog/add-index-oracle-diff.xml
@@ -13,7 +13,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="x" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/add-index-oracle-patch.xml b/common/changelog/add-index-oracle-patch.xml
index e29595c..9ceb77a 100644
--- a/common/changelog/add-index-oracle-patch.xml
+++ b/common/changelog/add-index-oracle-patch.xml
@@ -4,7 +4,7 @@
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="x" type="NUMBER(10)" null="false"/>
       <column name="y" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <index name="xy_i" type="UNIQUE">
diff --git a/common/changelog/add-table-oracle-diff.xml b/common/changelog/add-table-oracle-diff.xml
index 344f125..dd394a9 100644
--- a/common/changelog/add-table-oracle-diff.xml
+++ b/common/changelog/add-table-oracle-diff.xml
@@ -4,7 +4,7 @@
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <foreign-key name="object_o1_fk" deferrable="DEFERRED">
diff --git a/common/changelog/add-table-oracle-patch.xml b/common/changelog/add-table-oracle-patch.xml
index ed2e1fd..78f555a 100644
--- a/common/changelog/add-table-oracle-patch.xml
+++ b/common/changelog/add-table-oracle-patch.xml
@@ -11,7 +11,7 @@
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <foreign-key name="object_o1_fk" deferrable="DEFERRED">
diff --git a/common/changelog/alter-column-oracle-diff.xml b/common/changelog/alter-column-oracle-diff.xml
index 8a2953e..d49ea52 100644
--- a/common/changelog/alter-column-oracle-diff.xml
+++ b/common/changelog/alter-column-oracle-diff.xml
@@ -9,7 +9,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/alter-column-oracle-patch.xml b/common/changelog/alter-column-oracle-patch.xml
index e0c003b..0f48155 100644
--- a/common/changelog/alter-column-oracle-patch.xml
+++ b/common/changelog/alter-column-oracle-patch.xml
@@ -3,7 +3,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/drop-column-oracle-diff.xml b/common/changelog/drop-column-oracle-diff.xml
index 2f7636c..5109339 100644
--- a/common/changelog/drop-column-oracle-diff.xml
+++ b/common/changelog/drop-column-oracle-diff.xml
@@ -9,7 +9,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/drop-column-oracle-patch.xml b/common/changelog/drop-column-oracle-patch.xml
index 1851872..18e5dee 100644
--- a/common/changelog/drop-column-oracle-patch.xml
+++ b/common/changelog/drop-column-oracle-patch.xml
@@ -2,7 +2,7 @@
   <model version="2">
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/drop-foreign-key-oracle-diff.xml b/common/changelog/drop-foreign-key-oracle-diff.xml
index c8a04b2..5203218 100644
--- a/common/changelog/drop-foreign-key-oracle-diff.xml
+++ b/common/changelog/drop-foreign-key-oracle-diff.xml
@@ -10,7 +10,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <foreign-key name="object_o1_fk" deferrable="DEFERRED">
diff --git a/common/changelog/drop-foreign-key-oracle-patch.xml b/common/changelog/drop-foreign-key-oracle-patch.xml
index 54bee06..e44645b 100644
--- a/common/changelog/drop-foreign-key-oracle-patch.xml
+++ b/common/changelog/drop-foreign-key-oracle-patch.xml
@@ -2,7 +2,7 @@
   <model version="2">
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/drop-index-oracle-diff.xml b/common/changelog/drop-index-oracle-diff.xml
index f4ccba6..2ed5e65 100644
--- a/common/changelog/drop-index-oracle-diff.xml
+++ b/common/changelog/drop-index-oracle-diff.xml
@@ -9,7 +9,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <index name="object_num_i">
diff --git a/common/changelog/drop-index-oracle-patch.xml b/common/changelog/drop-index-oracle-patch.xml
index 2d864a6..b934c83 100644
--- a/common/changelog/drop-index-oracle-patch.xml
+++ b/common/changelog/drop-index-oracle-patch.xml
@@ -3,7 +3,7 @@
     <table name="object">
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
     </table>
diff --git a/common/changelog/drop-table-oracle-diff.xml b/common/changelog/drop-table-oracle-diff.xml
index 311e57e..39ed9be 100644
--- a/common/changelog/drop-table-oracle-diff.xml
+++ b/common/changelog/drop-table-oracle-diff.xml
@@ -9,7 +9,7 @@
       <column name="id" type="NUMBER(10)" null="false"/>
       <column name="num" type="NUMBER(10)" null="false"/>
       <column name="o1" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <foreign-key name="object_o1_fk" deferrable="DEFERRED">
diff --git a/common/changelog/model-oracle.xml b/common/changelog/model-oracle.xml
index 8b61d1c..bbe2660 100644
--- a/common/changelog/model-oracle.xml
+++ b/common/changelog/model-oracle.xml
@@ -7,7 +7,7 @@
       <column name="v_y" type="NUMBER(10)" null="false"/>
       <column name="o1_x" type="NUMBER(10)" null="true"/>
       <column name="o1_y" type="NUMBER(10)" null="true"/>
-      <primary-key auto="true">
+      <primary-key auto="true" sequence="object_seq">
         <column name="id"/>
       </primary-key>
       <foreign-key name="object_o1_fk" deferrable="DEFERRED">
-- 
cgit v1.1