Fix typo in column names in mapping as well.

[philipp/winterrodeln/wrpylib.git] / wrpylib / mwdb.py

diff --git a/wrpylib/mwdb.py b/wrpylib/mwdb.py
index 01f38451c5a28b1cf1e1b600314b3a1e4ff60728..e0682db1d6c01fd547d5aaa275257d35efbdd32c 100644 (file)
--- a/wrpylib/mwdb.py
+++ b/wrpylib/mwdb.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python3.4
-# -*- coding: iso-8859-15 -*-
 # $Id$
 # $HeadURL$
 """This module contains code to make the access of MediaWiki tables
@@ -17,13 +16,15 @@ def page_table(metadata):
     Column("page_namespace", types.Integer, nullable=False),
     Column("page_title", types.Unicode(255), nullable=False), # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
     Column("page_restrictions", types.String, nullable=False), # tinyblob NOT NULL
-    Column("page_counter", types.Integer, nullable=False),
     Column("page_is_redirect", types.Integer, nullable=False),
     Column("page_is_new", types.Integer, nullable=False),
     Column("page_random", types.Float, nullable=False),
     Column("page_touched", types.String(14, convert_unicode='force'), nullable=False), # binary(14) NOT NULL
     Column("page_latest", types.Integer, nullable=False),
     Column("page_len", types.Integer, nullable=False),
+    Column("page_content_model", types.String(32, convert_unicode='force')),
+    Column("page_links_updated", types.String(14, convert_unicode='force')),
+    Column("page_lang", types.String(35, convert_unicode='force')),
     )
 
 
@@ -65,7 +66,7 @@ def user_table(metadata):
     Column("user_id", types.Integer, primary_key=True),
     Column("user_name", types.Unicode(255), nullable=False), # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
     Column("user_real_name", types.Unicode(255), nullable=False), # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
-    # "user_password"
+    Column("user_password", types.UnicodeText, nullable=False),  # tinyblob
     # "user_newpassword"
     # "user_newpass_time"
     Column("user_email", types.Unicode, nullable=False), # tinytext NOT NULL
@@ -89,4 +90,3 @@ def categorylinks_table(metadata):
     Column("cl_sortkey", types.String(convert_unicode='force'), nullable=False), # varbinary(230) NOT NULL
     Column("cl_timestamp", types.DateTime, nullable=False),
     )
-