Changeset 14612

Timestamp:

May 28, 2015, 10:10:46 PM (9 years ago)

Author:

Ryan J Ollos

Message:

1.0.0dev: Utilize Trac 1.2 database API. Refs #12369.

Compatibility with Trac 1.0 is provided through the methods in compat.py.

Location:

codereviewerplugin/1.0

Files:

• coderev/api.py (modified) (2 diffs)
• coderev/compat.py (added)
• coderev/tests (added)
• coderev/tests/__init__.py (added)
• coderev/tests/api.py (added)
• coderev/upgrades/db1.py (modified) (2 diffs)
• coderev/upgrades/db2.py (modified) (2 diffs)
• coderev/upgrades/db3.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

codereviewerplugin/1.0/coderev/api.py

@@ -9 +9 @@
 #
 
-from trac.core import *
+from trac.core import Component, implements
 from trac.env import IEnvironmentSetupParticipant
 from trac.perm import IPermissionRequestor
-from trac.util.translation import _
+
+from coderev.compat import DatabaseManager
 
 DB_NAME = 'coderev'
@@ -29 +30 @@
 
     def environment_needs_upgrade(self, db=None):
-        current_db_version = self._get_version()
-        if current_db_version < DB_VERSION:
-            return True
-        if current_db_version > DB_VERSION:
-            raise TracError(_("Database newer than CodeReviewer version"))
-        return False
+        return DatabaseManager(self.env).needs_upgrade(DB_VERSION, DB_NAME)
 
     def upgrade_environment(self, db=None):
-        current_db_version = self._get_version()
-        with self.env.db_transaction as db:
-            cursor = db.cursor()
-            for i in range(current_db_version + 1, DB_VERSION + 1):
-                name = 'db%i' % i
-                try:
-                    upgrades = __import__('upgrades', globals(),
-                                          locals(), [name])
-                    script = getattr(upgrades, name)
-                except AttributeError:
-                    raise TracError(_("No CodeReviewer upgrade module %(num)i "
-                                      "(%(version)s.py)", num=i, version=name))
-                script.do_upgrade(self.env, cursor)
-                self._set_version(i)
-
-    def _get_version(self):
-        value = self.env.db_query("""
-            SELECT value FROM system WHERE name=%s
-            """, (DB_NAME,))
-        return int(value[0][0]) if value else 0
-
-    def _set_version(self, ver):
-        if self._get_version() == 0:
-            self.env.db_transaction("""
-                INSERT INTO system (value,name) VALUES (%s,%s)
-                """, (ver, DB_NAME))
-        else:
-            self.env.db_transaction("""
-                UPDATE system SET value=%s WHERE name=%s
-                """, (ver, DB_NAME))
-
-        self.log.info("Upgraded CodeReviewer version from %d to %d",
-                      ver-1, ver)
+        DatabaseManager(self.env).upgrade(DB_VERSION, DB_NAME,
+                                          'coderev.upgrades')
 
     # IPermissionRequestor methods

codereviewerplugin/1.0/coderev/upgrades/db1.py

@@ -8 +8 @@
 #
 
-from trac.db import Table, Column, Index, DatabaseManager
+from trac.db import Table, Column, Index
 
-def do_upgrade(env, cursor):
+from coderev.compat import DatabaseManager
 
-    db_tables = [
+
+def do_upgrade(env, ver, cursor):
+
+    schema = [
         Table('codereviewer')[
             Column('repo', type='text'),
@@ -20 +23 @@
             Column('summary', type='text'),
             Column('time', type='integer'),
-            Index(columns=['repo', 'changeset', 'time']),
+            Index(['repo', 'changeset', 'time']),
         ],
     ]
 
-    # create the initial table (and index)
-    db_connector = DatabaseManager(env).get_connector()[0]
-    for table in db_tables:
-        for sql in db_connector.to_sql(table):
-            cursor.execute(sql)
+    DatabaseManager(env).create_tables(schema)

codereviewerplugin/1.0/coderev/upgrades/db2.py

@@ -8 +8 @@
 #
 
-from trac.db import Table, Column, Index, DatabaseManager
+from trac.db import Table, Column
 
-def do_upgrade(env, cursor):
+from coderev.compat import DatabaseManager
 
-    db_tables = [
+
+def do_upgrade(env, ver, cursor):
+
+    schema = [
         Table('codereviewer_map', key=['repo', 'changeset', 'ticket'])[
             Column('repo', type='text'),
@@ -21 +24 @@
     ]
 
-    # create the map table
-    db_connector = DatabaseManager(env).get_connector()[0]
-    for table in db_tables:
-        for sql in db_connector.to_sql(table):
-            cursor.execute(sql)
+    DatabaseManager(env).create_tables(schema)

codereviewerplugin/1.0/coderev/upgrades/db3.py

@@ -9 +9 @@
 #
 
-from trac.db import DatabaseManager
+from trac.db.api import DatabaseManager
 
 
-def do_upgrade(env, cursor):
+def do_upgrade(env, ver, cursor):
 
     tables = [
@@ -19 +19 @@
     ]
 
-    db_connector, _ = DatabaseManager(env).get_connector()
+    db_connector = DatabaseManager(env).get_connector()[0]
     for table, columns in tables:
         # Alter column types

codereviewerplugin/1.0/setup.py

@@ -30 +30 @@
                                    'coderev.web_ui = coderev.web_ui',]},
     install_requires=['Trac'],
+    test_suite='coderev.tests',
 )