From b369a64715b256cba38411c8733c511712f9efdd Mon Sep 17 00:00:00 2001
From: David Rousselie <dax@happycoders.org>
Date: Sun, 9 Nov 2008 20:07:05 +0100
Subject: [PATCH] rename user table to user_table to avoir postgresql keyword
 conflict

darcs-hash:20081109190705-86b55-036cd024b6e2e5c3871c256e794c60363915afa8.gz
---
 .../2008-11-08/Account_sqlite.sql             | 14 +++++++++
 .../2008-11-08/LegacyJID_sqlite.sql           | 10 +++++++
 .../2008-11-08/PresenceAccount_sqlite.sql     | 13 ++++++++
 sqlobject_history/2008-11-08/User_sqlite.sql  |  9 ++++++
 .../2008-11-08/upgrade_sqlite_2008-11-09.sql  | 30 +++++++++++++++++++
 .../2008-11-09/Account_sqlite.sql             | 14 +++++++++
 .../2008-11-09/LegacyJID_sqlite.sql           | 10 +++++++
 .../2008-11-09/PresenceAccount_sqlite.sql     | 13 ++++++++
 sqlobject_history/2008-11-09/User_sqlite.sql  |  9 ++++++
 src/jcl/model/account.py                      |  3 ++
 10 files changed, 125 insertions(+)
 create mode 100644 sqlobject_history/2008-11-08/Account_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-08/LegacyJID_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-08/PresenceAccount_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-08/User_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-08/upgrade_sqlite_2008-11-09.sql
 create mode 100644 sqlobject_history/2008-11-09/Account_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-09/LegacyJID_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-09/PresenceAccount_sqlite.sql
 create mode 100644 sqlobject_history/2008-11-09/User_sqlite.sql

diff --git a/sqlobject_history/2008-11-08/Account_sqlite.sql b/sqlobject_history/2008-11-08/Account_sqlite.sql
new file mode 100644
index 0000000..39fcb19
--- /dev/null
+++ b/sqlobject_history/2008-11-08/Account_sqlite.sql
@@ -0,0 +1,14 @@
+-- Exported definition from 2008-11-09T13:58:16
+-- Class jcl.model.account.Account
+-- Database: sqlite
+CREATE TABLE account (
+    id INTEGER PRIMARY KEY,
+    name TEXT,
+    jid TEXT,
+    status TEXT,
+    error TEXT,
+    enabled BOOLEAN,
+    lastlogin TIMESTAMP,
+    user_id INT CONSTRAINT user_id_exists REFERENCES user(id) ,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-08/LegacyJID_sqlite.sql b/sqlobject_history/2008-11-08/LegacyJID_sqlite.sql
new file mode 100644
index 0000000..dc35ac1
--- /dev/null
+++ b/sqlobject_history/2008-11-08/LegacyJID_sqlite.sql
@@ -0,0 +1,10 @@
+-- Exported definition from 2008-11-09T13:58:16
+-- Class jcl.model.account.LegacyJID
+-- Database: sqlite
+CREATE TABLE legacy_j_id (
+    id INTEGER PRIMARY KEY,
+    legacy_address TEXT,
+    jid TEXT,
+    account_id INT CONSTRAINT account_id_exists REFERENCES account(id) ,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-08/PresenceAccount_sqlite.sql b/sqlobject_history/2008-11-08/PresenceAccount_sqlite.sql
new file mode 100644
index 0000000..2da6dd2
--- /dev/null
+++ b/sqlobject_history/2008-11-08/PresenceAccount_sqlite.sql
@@ -0,0 +1,13 @@
+-- Exported definition from 2008-11-09T13:58:16
+-- Class jcl.model.account.PresenceAccount
+-- Database: sqlite
+CREATE TABLE presence_account (
+    id INTEGER PRIMARY KEY,
+    chat_action INT,
+    online_action INT,
+    away_action INT,
+    xa_action INT,
+    dnd_action INT,
+    offline_action INT,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-08/User_sqlite.sql b/sqlobject_history/2008-11-08/User_sqlite.sql
new file mode 100644
index 0000000..4a3ce81
--- /dev/null
+++ b/sqlobject_history/2008-11-08/User_sqlite.sql
@@ -0,0 +1,9 @@
+-- Exported definition from 2008-11-09T13:58:16
+-- Class jcl.model.account.User
+-- Database: sqlite
+CREATE TABLE user (
+    id INTEGER PRIMARY KEY,
+    jid TEXT,
+    has_received_motd BOOLEAN,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-08/upgrade_sqlite_2008-11-09.sql b/sqlobject_history/2008-11-08/upgrade_sqlite_2008-11-09.sql
new file mode 100644
index 0000000..d3c73a3
--- /dev/null
+++ b/sqlobject_history/2008-11-08/upgrade_sqlite_2008-11-09.sql
@@ -0,0 +1,30 @@
+alter table user rename to user_table;
+begin transaction;
+CREATE TEMPORARY TABLE account_backup (
+    id INTEGER PRIMARY KEY,
+    name TEXT,
+    jid TEXT,
+    status TEXT,
+    error TEXT,
+    enabled BOOLEAN,
+    lastlogin TIMESTAMP,
+    user_id INT CONSTRAINT user_id_exists REFERENCES user_table(id) ,
+    child_name VARCHAR (255)
+);
+INSERT INTO account_backup SELECT * FROM account;
+DROP TABLE account;
+CREATE TABLE account (
+    id INTEGER PRIMARY KEY,
+    name TEXT,
+    jid TEXT,
+    status TEXT,
+    error TEXT,
+    enabled BOOLEAN,
+    lastlogin TIMESTAMP,
+    user_id INT CONSTRAINT user_id_exists REFERENCES user_table(id) ,
+    child_name VARCHAR (255)
+);
+INSERT INTO account SELECT * FROM account;
+DROP TABLE account_backup;
+commit;
+
diff --git a/sqlobject_history/2008-11-09/Account_sqlite.sql b/sqlobject_history/2008-11-09/Account_sqlite.sql
new file mode 100644
index 0000000..ecbe288
--- /dev/null
+++ b/sqlobject_history/2008-11-09/Account_sqlite.sql
@@ -0,0 +1,14 @@
+-- Exported definition from 2008-11-09T13:58:34
+-- Class jcl.model.account.Account
+-- Database: sqlite
+CREATE TABLE account (
+    id INTEGER PRIMARY KEY,
+    name TEXT,
+    jid TEXT,
+    status TEXT,
+    error TEXT,
+    enabled BOOLEAN,
+    lastlogin TIMESTAMP,
+    user_id INT CONSTRAINT user_id_exists REFERENCES user_table(id) ,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-09/LegacyJID_sqlite.sql b/sqlobject_history/2008-11-09/LegacyJID_sqlite.sql
new file mode 100644
index 0000000..1d64b35
--- /dev/null
+++ b/sqlobject_history/2008-11-09/LegacyJID_sqlite.sql
@@ -0,0 +1,10 @@
+-- Exported definition from 2008-11-09T13:58:34
+-- Class jcl.model.account.LegacyJID
+-- Database: sqlite
+CREATE TABLE legacy_j_id (
+    id INTEGER PRIMARY KEY,
+    legacy_address TEXT,
+    jid TEXT,
+    account_id INT CONSTRAINT account_id_exists REFERENCES account(id) ,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-09/PresenceAccount_sqlite.sql b/sqlobject_history/2008-11-09/PresenceAccount_sqlite.sql
new file mode 100644
index 0000000..12fcd80
--- /dev/null
+++ b/sqlobject_history/2008-11-09/PresenceAccount_sqlite.sql
@@ -0,0 +1,13 @@
+-- Exported definition from 2008-11-09T13:58:34
+-- Class jcl.model.account.PresenceAccount
+-- Database: sqlite
+CREATE TABLE presence_account (
+    id INTEGER PRIMARY KEY,
+    chat_action INT,
+    online_action INT,
+    away_action INT,
+    xa_action INT,
+    dnd_action INT,
+    offline_action INT,
+    child_name VARCHAR (255)
+)
diff --git a/sqlobject_history/2008-11-09/User_sqlite.sql b/sqlobject_history/2008-11-09/User_sqlite.sql
new file mode 100644
index 0000000..2f4f731
--- /dev/null
+++ b/sqlobject_history/2008-11-09/User_sqlite.sql
@@ -0,0 +1,9 @@
+-- Exported definition from 2008-11-09T13:58:34
+-- Class jcl.model.account.User
+-- Database: sqlite
+CREATE TABLE user_table (
+    id INTEGER PRIMARY KEY,
+    jid TEXT,
+    has_received_motd BOOLEAN,
+    child_name VARCHAR (255)
+)
diff --git a/src/jcl/model/account.py b/src/jcl/model/account.py
index 2b1d4b5..99991da 100644
--- a/src/jcl/model/account.py
+++ b/src/jcl/model/account.py
@@ -62,6 +62,9 @@ def mandatory_field(field_name, field_value):
     return field_value
     
 class User(InheritableSQLObject):
+    class sqlmeta:
+        table = "user_table"
+
     _connection = model.hub
 
     jid = StringCol()