Changeset 1342:0315f87b3063

Timestamp:

06/18/10 15:06:53 (2 years ago)

Author:

mitsuhiko

Branch:

default

Message:

Kinda fixed eric the fish for new migrations. Kinda not because i have no
idea why this works. db.query_property is session bound yet it sortof
works if db.basic_mapper (orm.mapper) is used.

Files:

• external-plugins/eric_the_fish/versions/001_Move_fortunes_to_the_database.py (modified) (2 diffs)
• zine/database.py (modified) (3 diffs)
• zine/templates/admin/perform_upgrade.html (modified) (1 diff)
• zine/upgrades/__init__.py (modified) (3 diffs)
• zine/upgrades/customisation.py (modified) (2 diffs)

external-plugins/eric_the_fish/versions/001_Move_fortunes_to_the_database.py

@@ -30 +30 @@
                                                     autoflush=True,
                                                     autocommit=False))
-    map_tables(session.mapper)
+    map_tables(db.basic_mapper)
     metadata.bind = migrate_engine
     if not fortunes.exists():
@@ -51 +51 @@
                                                     autoflush=True,
                                                     autocommit=False))
-    map_tables(session.mapper)
+    map_tables(db.basic_mapper)
     yield '<p>Removing the fortunes from the database</p>\n'
 

zine/database.py

@@ -212 +212 @@
     old_init = getattr(cls, '__init__', None)
     def register_init(self, *args, **kwargs):
-        old_init(self, *args, **kwargs)
+        if old_init is not None:
+            old_init(self, *args, **kwargs)
         session.add(self)
     cls.__init__ = register_init
@@ -236 +237 @@
 
 #: forward some session methods to the module as well
-for name in 'delete', 'flush', 'execute', 'begin', 'mapper', \
-            'commit', 'rollback', 'refresh', 'expire', \
-            'query_property':
+for name in 'delete', 'flush', 'execute', 'begin',  'commit', 'rollback', \
+            'refresh', 'expire', 'query_property':
     setattr(db, name, getattr(session, name))
 
@@ -249 +249 @@
 db.ZEMLParserData = ZEMLParserData
 db.mapper = mapper
+db.basic_mapper = orm.mapper
 db.association_proxy = association_proxy
 db.attribute_loaded = attribute_loaded

zine/templates/admin/perform_upgrade.html

@@ -97 +97 @@
       {%- for event in live_log %}{{ event }}{%- endfor %}
       <p class="finish">{% trans %}Database upgrade finished.{% endtrans %}</p>
-      <br/>
+      <br>
       <div class="message">{% trans %}Zine maintenance mode has been switched on.
           Please <a href="{{ blog_url }}">check your blog</a> to see if the

zine/upgrades/__init__.py

@@ -24 +24 @@
 from migrate.versioning.util import construct_engine
 from migrate.versioning.exceptions import KnownError
+
+from werkzeug.utils import escape
 
 from zine import __version__ as VERSION, setup
@@ -214 +216 @@
             except Exception, msg:
                 yield '<p>error upgrading %s: ' % sv.repository_id
-                yield str(msg)
+                yield escape(str(msg).decode('utf-8', 'ignore'))
                 yield '</p>\n'
 
@@ -237 +239 @@
         except Exception, msg:
             yield '<p>error downgrading %s: ' % repo_id
-            yield str(msg)
+            yield escape(str(msg).decode('utf-8', 'ignore'))
             yield '</p>\n'
 

zine/upgrades/customisation.py

@@ -14 +14 @@
 from os.path import dirname, join
 
-from migrate.versioning import api, base, exceptions
+from migrate.versioning import api, exceptions
+from migrate.versioning.config import operations as migrate_ops
 from migrate.versioning.repository import Repository as MigrateRepository
 from migrate.versioning.script.py import PythonScript as MigratePythonScript
@@ -87 +88 @@
         else:
             raise exceptions.ScriptError("%d is not a valid step" % step)
-        funcname = base.operations[op]
+        funcname = migrate_ops[op]
         script_func = self._func(funcname)
         try: