[Hejes-devel] [853] ekwiki: DB tweaks

[hejes-devel at nytud.hu]

Revision: 853
Author:   mihaltz
Date:     2013-07-18 13:01:22 +0200 (Thu, 18 Jul 2013)
Log Message:
-----------
ekwiki: DB tweaks

Modified Paths:
--------------
    trunk/web2py/applications/ekwiki/databases/c8b669d15150d7109e5f7ab36744a5b7_wiki_page.table
    trunk/web2py/applications/ekwiki/databases/storage.sqlite
    trunk/web2py/applications/ekwiki/models/db.py

Modified: trunk/web2py/applications/ekwiki/databases/c8b669d15150d7109e5f7ab36744a5b7_wiki_page.table
===================================================================
--- trunk/web2py/applications/ekwiki/databases/c8b669d15150d7109e5f7ab36744a5b7_wiki_page.table	2013-07-18 10:59:27 UTC (rev 852)
+++ trunk/web2py/applications/ekwiki/databases/c8b669d15150d7109e5f7ab36744a5b7_wiki_page.table	2013-07-18 11:01:22 UTC (rev 853)
@@ -22,7 +22,7 @@
 p10
 S'text'
 p11
-ssS'can_edit'
+ssS'tags'
 p12
 (dp13
 g4
@@ -30,7 +30,7 @@
 sg5
 I00
 sg6
-I9
+I7
 sg7
 S'TEXT'
 p14
@@ -39,7 +39,7 @@
 sg10
 S'list:string'
 p15
-ssS'modified_by'
+ssS'is_active'
 p16
 (dp17
 g4
@@ -47,49 +47,49 @@
 sg5
 I00
 sg6
-I16
+I12
 sg7
-S'INTEGER REFERENCES auth_user (id) ON DELETE CASCADE'
+S'CHAR(1)'
 p18
 sg9
 I00
 sg10
-S'reference auth_user'
+S'boolean'
 p19
-ssS'title'
+ssS'rulestr'
 p20
 (dp21
 g4
-I512
+I32768
 sg5
-I01
+I00
 sg6
-I5
+I2
 sg7
-S'CHAR(512) UNIQUE'
+S'TEXT'
 p22
 sg9
 I00
 sg10
-S'string'
+g11
+ssS'created_on'
 p23
-ssS'rulestr'
-p24
-(dp25
+(dp24
 g4
-I32768
+I512
 sg5
 I00
 sg6
-I2
+I13
 sg7
-S'TEXT'
-p26
+S'TIMESTAMP'
+p25
 sg9
 I00
 sg10
-g11
-ssS'tags'
+S'datetime'
+p26
+ssS'modified_on'
 p27
 (dp28
 g4
@@ -97,15 +97,15 @@
 sg5
 I00
 sg6
-I7
+I15
 sg7
-S'TEXT'
+S'TIMESTAMP'
 p29
 sg9
 I00
 sg10
-g15
-ssS'is_active'
+g26
+ssS'id'
 p30
 (dp31
 g4
@@ -113,16 +113,16 @@
 sg5
 I00
 sg6
-I12
+I1
 sg7
-S'CHAR(1)'
+S'INTEGER PRIMARY KEY AUTOINCREMENT'
 p32
 sg9
 I00
 sg10
-S'boolean'
+S'id'
 p33
-ssS'changelog'
+ssS'can_edit'
 p34
 (dp35
 g4
@@ -130,15 +130,15 @@
 sg5
 I00
 sg6
-I10
+I9
 sg7
-S'CHAR(512)'
+S'TEXT'
 p36
 sg9
 I00
 sg10
-g23
-ssS'created_by'
+g15
+ssS'modified_by'
 p37
 (dp38
 g4
@@ -146,97 +146,97 @@
 sg5
 I00
 sg6
-I14
+I16
 sg7
 S'INTEGER REFERENCES auth_user (id) ON DELETE CASCADE'
 p39
 sg9
 I00
 sg10
-g19
-ssS'id'
+S'reference auth_user'
 p40
-(dp41
+ssS'title'
+p41
+(dp42
 g4
 I512
 sg5
-I00
+I01
 sg6
-I1
+I5
 sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p42
+S'CHAR(512) UNIQUE'
+p43
 sg9
 I00
 sg10
-S'id'
-p43
-ssS'rulekey'
+S'string'
 p44
-(dp45
+ssS'changelog'
+p45
+(dp46
 g4
-I32768
+I512
 sg5
 I00
 sg6
-I3
+I10
 sg7
-S'TEXT'
-p46
+S'CHAR(512)'
+p47
 sg9
 I00
 sg10
-g11
-ssS'can_read'
-p47
-(dp48
+g44
+ssS'created_by'
+p48
+(dp49
 g4
 I512
 sg5
 I00
 sg6
-I8
+I14
 sg7
-S'TEXT'
-p49
+S'INTEGER REFERENCES auth_user (id) ON DELETE CASCADE'
+p50
 sg9
 I00
 sg10
-g15
-ssS'created_on'
-p50
-(dp51
+g40
+ssS'slug'
+p51
+(dp52
 g4
 I512
 sg5
 I00
 sg6
-I13
+I4
 sg7
-S'TIMESTAMP'
-p52
+S'CHAR(512)'
+p53
 sg9
 I00
 sg10
-S'datetime'
-p53
-ssS'html'
+g44
+ssS'rulekey'
 p54
 (dp55
 g4
-I32768
+I512
 sg5
 I00
 sg6
-I11
+I3
 sg7
-S'TEXT'
+S'CHAR(512)'
 p56
 sg9
 I00
 sg10
-g11
-ssS'modified_on'
+g44
+ssS'can_read'
 p57
 (dp58
 g4
@@ -244,28 +244,28 @@
 sg5
 I00
 sg6
-I15
+I8
 sg7
-S'TIMESTAMP'
+S'TEXT'
 p59
 sg9
 I00
 sg10
-g53
-ssS'slug'
+g15
+ssS'html'
 p60
 (dp61
 g4
-I512
+I32768
 sg5
 I00
 sg6
-I4
+I11
 sg7
-S'CHAR(512)'
+S'TEXT'
 p62
 sg9
 I00
 sg10
-g23
+g11
 ss.
\ No newline at end of file

Modified: trunk/web2py/applications/ekwiki/databases/storage.sqlite
===================================================================
(Binary files differ)

Modified: trunk/web2py/applications/ekwiki/models/db.py
===================================================================
--- trunk/web2py/applications/ekwiki/models/db.py	2013-07-18 10:59:27 UTC (rev 852)
+++ trunk/web2py/applications/ekwiki/models/db.py	2013-07-18 11:01:22 UTC (rev 853)
@@ -87,7 +87,7 @@
 # Added by MM:
 
 # Add custom fields to the wiki pages
-auth.settings.extra_fields["wiki_page"] = [Field("rulestr", "text"), Field("rulekey", "text")]
+auth.settings.extra_fields["wiki_page"] = [Field("rulestr", "text"), Field("rulekey")]
 
 # See http://www.web2py.com/books/default/chapter/29/03#Extending-the-auth.wiki-feature
 auth.wiki(resolve=False)