Renamed to_title to dbkay_to_title and improved docstring.

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

diff --git a/wrpylib/wrmwdb.py b/wrpylib/wrmwdb.py
index c930ec1e43655d1140d4c8353a3f99ac2decb7c9..bcd9d34ced4eebb35134e9c9ae9700c7d8850031 100644 (file)
--- a/wrpylib/wrmwdb.py
+++ b/wrpylib/wrmwdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3.4
 # -*- coding: iso-8859-15 -*-
 # $Id$
 # $HeadURL$
@@ -37,6 +37,7 @@ def wrreport_table(metadata):
     Column("delete_person_userid", types.Integer),
     Column("delete_person_username", types.Unicode(30)),
     Column("delete_reason_public", types.Unicode),
+    Column("delete_invisible", types.Boolean),
     )
 
 
@@ -47,8 +48,9 @@ def wrsledruncache_table(metadata):
     :param metadata: metadata = sqlalchemy.MetaData()
     """
     return Table("wrsledruncache", metadata,
-    Column("page_id", types.Integer, primary_key=True),
+    Column("page_id", types.Integer, schema.ForeignKey('wrreportcache.page_id'), primary_key=True),
     Column("page_title", types.Unicode(255)),
+    Column("name_url", types.Unicode(255)),
     Column("position_latitude", types.Float),
     Column("position_longitude", types.Float),
     Column("top_latitude", types.Float),
@@ -124,7 +126,7 @@ def wrreportcache_table(metadata):
     return Table("wrreportcache", metadata,
     Column("page_id", types.Integer, primary_key=True),
     Column("page_title", types.Unicode(255), nullable=False),
-    Column("report_id", types.Integer),
+    Column("report_id", types.Integer, schema.ForeignKey('wrreport.id')),
     Column("date_report", types.Date),
     Column("condition", types.Integer),
     Column("description", types.Unicode),
@@ -133,3 +135,29 @@ def wrreportcache_table(metadata):
     )
 
 
+def wrregion_table(metadata):
+    """Returns the sqlalchemy Table representing the "wrregion" Winterrodeln table in MediaWiki.
+    Current table definition.
+    * version 1.5 (introduction)
+    :param metadata: metadata = sqlalchemy.MetaData()
+    """
+    return Table("wrregion", metadata,
+    Column("id", types.Integer, primary_key=True),
+    Column("name", types.Unicode(50)),
+    Column("page_id", types.Integer),
+    Column("border", types.Binary) # MultiPolygon(2, 4326)
+    )
+
+
+def wrregioncache_table(metadata):
+    """Returns the sqlalchemy Table representing the "wrregioncache" Winterrodeln table in MediaWiki.
+    Current table definition.
+    * version 1.5 (introduction)
+    :param metadata: metadata = sqlalchemy.MetaData()
+    """
+    return Table("wrregioncache", metadata,
+    Column("id", types.Integer, primary_key=True),
+    Column("region_id", types.Integer, schema.ForeignKey('wrregin.id')),
+    Column("page_id", types.Integer)
+    )
+