Changeset 474

Timestamp:

09/22/08 13:29:02 (5 years ago)

Author:

rcorsaro

Message:

fixed defect where tables for disabled plugins caused failure.

File:

• trunk/plugins/oforgeplugin/oforge/api.py (modified) (6 diffs)

trunk/plugins/oforgeplugin/oforge/api.py

@@ -5 +5 @@
 import logging
 import pkg_resources
+import psycopg2 
 import re
 import traceback
@@ -15 +16 @@
 import trac.db_default
 import trac.db
-
-import psycopg2 
 
 class OForgeProjectCreationError(Exception):
@@ -170 +169 @@
         # Setup vars
         config = self.getconfig(name)
-        category = config.get('trac', 'category')
-        new_schema = name
-        new_user = name
+        new_schema = re.sub('\W+', '', name)
+        new_user = re.sub('\W+', '', name)
         new_password = config.get('oforge','initial_db_password', 'secret')
         project_desc = config.get('project','desc', name)
+        category = config.get('project', 'category')
+        project_display_name = config.get('project','name', name)
         project_id = None
         # Create the new schema/user
@@ -197 +197 @@
                         (id, name, display_name, type, active_state, start_date) 
                         VALUES(%s, '%s', '%s', '%s', 'Open', '%s')
-                    """%(project_id, name, project_desc, category, datetime.datetime.now()))
+                    """%(project_id, name, project_display_name, category, datetime.datetime.now()))
             master_db_cnx.commit()
         except Exception, e:
@@ -204 +204 @@
 
         src_db_cnx = self.getenv(name).get_db_cnx()
-        src_cursor = src_db_cnx.cursor()
-        # Get list of tables excluding ones that shouldn't be copeied
-        src_cursor.execute("""
-            SELECT name 
-            FROM sqlite_master 
-            WHERE type = 'table' AND name != 'session' 
-                AND name != 'auth_cookie'
-            ORDER BY name""")
         # Set trac database to new postgres schema
         props = self.postgres_db_props()
@@ -229 +221 @@
             EnvironmentSetup(new_env).environment_created()
             new_env.upgrade(backup=False)
+            # Get list of tables excluding ones that shouldn't be copeied
+            target_db_cursor = target_db_cnx.cursor()
+            target_db_cursor.execute("""
+                SELECT table_name 
+                FROM information_schema.tables 
+                WHERE table_schema = '%s' AND table_name != 'session' 
+                    AND table_name != 'auth_cookie'""", (new_schema,))
             # Copy tables
-            for table in map(lambda r: r[0], src_cursor.fetchall()):
+            for table in map(lambda r: r[0], target_db_cursor.fetchall()):
                 self._copy_table(src_db_cnx, target_db_cnx, table)
             # Commit all changes