From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Thu, 3 Sep 2015 14:30:47 +0000 (+0200)
Subject: Fix initialization of plugin_data table in AdminStore
X-Git-Tag: v1.1.0~28
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=a6e15cb542e58fb02e29011b9517d7c5e2e7c5cc

Fix initialization of plugin_data table in AdminStore

This was created ad-hoc before, but now has to be created by the
upgrade script.

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: Rob Crittenden <rcritten@redhat.com>
---

diff --git a/ipsilon/tools/dbupgrade.py b/ipsilon/tools/dbupgrade.py
index 16eebb6..e6d2b16 100644
--- a/ipsilon/tools/dbupgrade.py
+++ b/ipsilon/tools/dbupgrade.py
@@ -56,12 +56,12 @@ def execute_upgrade(cfgfile):
     # pylint: disable=protected-access
     Store._is_upgrade = True
 
-    datastore = AdminStore()
+    adminstore = AdminStore()
     # First try to upgrade the config store before continuing
-    if not _upgrade_database(datastore):
+    if not _upgrade_database(adminstore):
         return upgrade_failed()
 
-    admin_config = datastore.load_config()
+    admin_config = adminstore.load_config()
     for option in admin_config:
         cherrypy.config[option] = admin_config[option]
 
@@ -95,6 +95,8 @@ def execute_upgrade(cfgfile):
         for plugin in root._site[facility].enabled:
             print 'Handling plugin %s' % plugin
             plugin = root._site[facility].available[plugin]
+            print 'Creating plugin AdminStore table'
+            adminstore.create_plugin_data_table(plugin.name)
             for store in plugin.used_datastores():
                 print 'Handling plugin datastore %s' % store.__class__.__name__
                 if not _upgrade_database(store):
diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py
index 79b7156..835924d 100644
--- a/ipsilon/util/data.py
+++ b/ipsilon/util/data.py
@@ -617,6 +617,12 @@ class AdminStore(Store):
         else:
             raise NotImplementedError()
 
+    def create_plugin_data_table(self, plugin_name):
+        table = plugin_name+'_data'
+        q = self._query(self._db, table, UNIQUE_DATA_TABLE,
+                        trans=False)
+        q.create()
+
 
 class UserStore(Store):
 
diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index 978e470..6aecbf6 100644
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -150,6 +150,7 @@ class PluginObject(Log):
         try:
             Store._is_upgrade = True  # pylint: disable=protected-access
             self.on_enable()
+            self._data.create_plugin_data_table(self.name)
             for store in self.used_datastores():
                 store.upgrade_database()
         finally: