[sql] Default data should be in fixtures, not custom SQL

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/fixtures/default_projects.xml b/apps/patchwork/fixtures/default_projects.xml
new file mode 100644 (file)
index 0000000..c67fa56
--- /dev/null
+++ b/apps/patchwork/fixtures/default_projects.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+
+  <!-- some default projects -->
+  <object pk="1" model="patchwork.project">
+    <field type="CharField" name="linkname">cbe-oss-dev</field>
+    <field type="CharField" name="name">Cell Broadband Engine development</field>
+    <field type="CharField" name="listid">cbe-oss-dev.ozlabs.org</field>
+    <field type="CharField" name="listemail">cbe-oss-dev@ozlabs.org</field>
+  </object>
+  <object pk="2" model="patchwork.project">
+    <field type="CharField" name="linkname">linuxppc-dev</field>
+    <field type="CharField" name="name">Linux PPC development</field>
+    <field type="CharField" name="listid">linuxppc-dev.ozlabs.org</field>
+    <field type="CharField" name="listemail">linuxppc-dev@ozlabs.org</field>
+  </object>
+
+</django-objects>

diff --git a/apps/patchwork/fixtures/initial_data.xml b/apps/patchwork/fixtures/initial_data.xml
new file mode 100644 (file)
index 0000000..86e1105
--- /dev/null
+++ b/apps/patchwork/fixtures/initial_data.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+
+  <!-- default states -->
+  <object pk="1" model="patchwork.state">
+    <field type="CharField" name="name">New</field>
+    <field type="IntegerField" name="ordering">0</field>
+    <field type="BooleanField" name="action_required">True</field>
+  </object>
+  <object pk="2" model="patchwork.state">
+    <field type="CharField" name="name">Under Review</field>
+    <field type="IntegerField" name="ordering">1</field>
+    <field type="BooleanField" name="action_required">True</field>
+  </object>
+  <object pk="3" model="patchwork.state">
+    <field type="CharField" name="name">Accepted</field>
+    <field type="IntegerField" name="ordering">2</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="4" model="patchwork.state">
+    <field type="CharField" name="name">Rejected</field>
+    <field type="IntegerField" name="ordering">3</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="5" model="patchwork.state">
+    <field type="CharField" name="name">RFC</field>
+    <field type="IntegerField" name="ordering">4</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="6" model="patchwork.state">
+    <field type="CharField" name="name">Not Applicable</field>
+    <field type="IntegerField" name="ordering">5</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="7" model="patchwork.state">
+    <field type="CharField" name="name">Changes Requested</field>
+    <field type="IntegerField" name="ordering">6</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="8" model="patchwork.state">
+    <field type="CharField" name="name">Awaiting Upstream</field>
+    <field type="IntegerField" name="ordering">7</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="9" model="patchwork.state">
+    <field type="CharField" name="name">Superseded</field>
+    <field type="IntegerField" name="ordering">8</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+  <object pk="10" model="patchwork.state">
+    <field type="CharField" name="name">Deferred</field>
+    <field type="IntegerField" name="ordering">9</field>
+    <field type="BooleanField" name="action_required">False</field>
+  </object>
+</django-objects>

diff --git a/apps/patchwork/sql/project.sql b/apps/patchwork/sql/project.sql
deleted file mode 100644 (file)
index f0db525..0000000
--- a/apps/patchwork/sql/project.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-insert into patchwork_project (linkname, name, listid, listemail)
-    values ('cbe-oss-dev', 'Cell Broadband Engine development',
-            'cbe-oss-dev.ozlabs.org', 'cbe-oss-dev@ozlabs.org');
-insert into patchwork_project (linkname, name, listid, listemail)
-    values ('linuxppc-dev', 'Linux PPC development',
-            'linuxppc-dev.ozlabs.org', 'linuxppc-dev@ozlabs.org');

diff --git a/apps/patchwork/sql/state.sql b/apps/patchwork/sql/state.sql
deleted file mode 100644 (file)
index c673fd8..0000000
--- a/apps/patchwork/sql/state.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-insert into patchwork_state (ordering, name, action_required) values
-    (0, 'New', True);
-insert into patchwork_state (ordering, name, action_required) values
-    (1, 'Under Review', True);
-insert into patchwork_state (ordering, name, action_required) values
-    (2, 'Accepted', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (3, 'Rejected', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (4, 'RFC', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (5, 'Not Applicable', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (6, 'Changes Requested', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (7, 'Awaiting Upstream', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (8, 'Superseded', False);
-insert into patchwork_state (ordering, name, action_required) values
-    (9, 'Deferred', False);