Adds a file format option to xml backups.

[osqa.git] / forum_modules / sximporter / orm.py

diff --git a/forum_modules/sximporter/orm.py b/forum_modules/sximporter/orm.py
index 39439bc0a361f952696090eed92d480551210179..ff23c854c0b837d593f7756f8ac9144c9e2567b8 100644 (file)
--- a/forum_modules/sximporter/orm.py
+++ b/forum_modules/sximporter/orm.py
@@ -2,9 +2,7 @@ from south.v2 import DataMigration
 from south.orm import FakeORM\r
 \r
 class Migration(DataMigration):\r
-\r
     def forwards(self, orm):\r
-\r
         pass\r
 \r
 \r
@@ -60,6 +58,7 @@ class Migration(DataMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'ip': ('django.db.models.fields.CharField', [], {'max_length': '16'}),\r
             'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actions'", 'null': 'True', 'to': "orm['forum.Node']"}),\r
+            'real_user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'proxied_actions'", 'null': 'True', 'to': "orm['forum.User']"}),\r
             'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actions'", 'to': "orm['forum.User']"})\r
         },\r
         'forum.actionrepute': {\r
@@ -126,6 +125,7 @@ class Migration(DataMigration):
             'added_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),\r
             'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nodes'", 'to': "orm['forum.User']"}),\r
             'body': ('django.db.models.fields.TextField', [], {}),\r
+            'extra': ('forum.models.utils.PickledObjectField', [], {'null': 'True'}),\r
             'extra_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),\r
             'extra_ref': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']", 'null': 'True'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
@@ -155,7 +155,7 @@ class Migration(DataMigration):
         },\r
         'forum.nodestate': {\r
             'Meta': {'unique_together': "(('node', 'state_type'),)", 'object_name': 'NodeState'},\r
-            'action': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'node_state'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
+            'action': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'node_state'", 'unique': 'True', 'to': "orm['forum.Action']"}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'node': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'states'", 'to': "orm['forum.Node']"}),\r
             'state_type': ('django.db.models.fields.CharField', [], {'max_length': '16'})\r
@@ -181,7 +181,7 @@ class Migration(DataMigration):
             'Meta': {'object_name': 'QuestionSubscription'},\r
             'auto_subscription': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
-            'last_view': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 5, 25, 0, 18, 31, 631000)'}),\r
+            'last_view': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 7, 1, 13, 6, 46, 789996)'}),\r
             'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.Node']"}),\r
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['forum.User']"})\r
         },\r
@@ -203,6 +203,7 @@ class Migration(DataMigration):
             'questions_asked': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),\r
             'questions_commented': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),\r
             'questions_viewed': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),\r
+            'send_digest': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),\r
             'subscribed_questions': ('django.db.models.fields.CharField', [], {'default': "'i'", 'max_length': '1'}),\r
             'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'subscription_settings'", 'unique': 'True', 'to': "orm['forum.User']"})\r
         },\r
@@ -231,9 +232,16 @@ class Migration(DataMigration):
             'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),\r
             'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})\r
         },\r
+        'forum.userproperty': {\r
+            'Meta': {'unique_together': "(('user', 'key'),)", 'object_name': 'UserProperty'},\r
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '16'}),\r
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'properties'", 'to': "orm['forum.User']"}),\r
+            'value': ('forum.models.utils.PickledObjectField', [], {'null': 'True'})\r
+        },\r
         'forum.validationhash': {\r
             'Meta': {'unique_together': "(('user', 'type'),)", 'object_name': 'ValidationHash'},\r
-            'expiration': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 5, 26, 0, 18, 31, 914000)'}),\r
+            'expiration': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 7, 2, 13, 6, 46, 883626)'}),\r
             'hash_code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),\r
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),\r
             'seed': ('django.db.models.fields.CharField', [], {'max_length': '12'}),\r