More fixes due to Datasource changes

DataSource/MySQL/migrationhandler.py

@@ -41,27 +41,38 @@ import DataSource.dummy
 
 
 ## @brief Modify a MySQL database given editorial model changes
-class MigrationHandler(DataSource.dummy.MigrationHandler):
+class MigrationHandler(DataSource.dummy.migrationhandler.MigrationHandler):
 
     ## @brief Construct a MysqlMigrationHandler
     # @param module : sql module
     # @param conn_args dict : A dict containing connection options
     # @param db_engine str : Name of a MySQL db engine (default is InnoDB, don't change it ! ;) ) 
     # @param **kwargs : arguement given to the module.connect() method
-    def __init__(self, module=pymysql, conn_args=None, db_engine='InnoDB', **kwargs):
+    def __init__(self, module=pymysql, conn_args=None, db_engine='InnoDB'):
         # Database connection
         self._dbmodule = module
         if conn_args is None:
-            conn_args = copy.copy(Settings.get('datasource')['default'])
+            conn_args = copy.copy(Settings.datasource_options['default'])
             self._dbmodule = conn_args['module']
             del conn_args['module']
         self.db_conn = self._dbmodule.connect(**conn_args)
         # Fetch options
-        mh_settings = Settings.migration_options
-        self.debug = kwargs['debug'] if 'debug' in kwargs else Settings.debug_sql
-        self.dryrun = kwargs['dryrun'] if 'dryrun' in kwargs else mh_settings['dryrun']
-        self.foreign_keys = kwargs['foreign_keys'] if 'foreign_keys' in kwargs else mh_settings['foreign_keys']
-        self.drop_if_exists = kwargs['drop_if_exists'] if 'drop_if_exists' in kwargs else mh_settings['drop_if_exists']
+        mh_settings = Settings.migrationhandler_options
+
+        defaults = {
+            'debug': False,
+            'dryrun': False,
+            'foreign_keys': True,
+            'drop_if_exists': False
+        }
+
+        for opt_name in defaults:
+            if opt_name in mh_settings:
+                opt_val = mh_settings[opt_name]
+            else:
+                opt_val = defaults[opt_name]
+            setattr(self, opt_name, opt_val)
+
         self.db_engine = db_engine
         #Create default tables
         self._create_default_tables(self.drop_if_exists)

EditorialModel/model.py

@@ -4,7 +4,7 @@
 # Contains the class managing and editorial model
 
 import EditorialModel
-from DataSource.dummy.migrationhandler import MigrationHandler
+import DataSource.dummy.migrationhandler
 from EditorialModel.backend.dummy_backend import EmBackendDummy
 from EditorialModel.classes import EmClass
 from EditorialModel.fields import EmField
@@ -24,8 +24,8 @@ class Model(object):
     # @param migration_handler : A migration handler
     def __init__(self, backend, migration_handler=None):
         if migration_handler is None:
-            self.migration_handler = MigrationHandler()
-        elif issubclass(migration_handler.__class__, MigrationHandler):
+            self.migration_handler = DataSource.dummy.migrationhandler.MigrationHandler()
+        elif issubclass(migration_handler.__class__, DataSource.dummy.migrationhandler.MigrationHandler):
             self.migration_handler = migration_handler
         else:
             raise TypeError("migration_handler should be an instance from a subclass of DummyMigrationhandler")

Lodel/settings_format.py

@@ -11,7 +11,7 @@ MANDATORY = [
     'dynamic_code_file',
     'ds_package',
     'datasource_options',
-    'migration_options',
+    'migrationhandler_options',
     'base_path',
     'plugins',
     'logging',

install/instance_settings.py

@@ -14,8 +14,7 @@ em_file = 'em.json'
 dynamic_code_file = 'dynleapi.py'
 
 ds_package = 'MySQL'
-mh_classname = 'MysqlMigrationHandler'
-datasource = {
+datasource_options = {
     'default': {
         'module': pymysql,
         'host': '127.0.0.1',
@@ -24,3 +23,8 @@ datasource = {
         'db': 'DBNAME'
     }
 }
+
+""" # example
+ds_package = 'jsondiff'
+datasource_options = { 'json_file': 'output.json' }
+"""

install/loader.py

@@ -19,6 +19,7 @@ from plugins import * #Load activated plugins
 if os.path.isfile(Settings.dynamic_code_file):
     from dynleapi import *
 
+""" # useless ?
 # Import wanted datasource objects
 for db_modname in ['leapidatasource', 'migrationhandler']:
     mod = importlib.import_module("DataSource.{pkg_name}.{mod_name}".format(
@@ -28,6 +29,8 @@ for db_modname in ['leapidatasource', 'migrationhandler']:
     )
     # Expose the module in globals
     globals()[db_modname] = mod
+"""
+
 
 if __name__ == '__main__':
     import code

install/utils.py

@@ -9,7 +9,6 @@ def refreshdyn():
     from EditorialModel.model import Model
     from leapi.lefactory import LeFactory
     from EditorialModel.backend.json_backend import EmBackendJson
-    from DataSource.MySQL.leapidatasource import LeDataSourceSQL
     OUTPUT = Settings.dynamic_code_file
     EMJSON = Settings.em_file
     # Load editorial model
@@ -17,13 +16,14 @@ def refreshdyn():
     # Generate dynamic code
     fact = LeFactory(OUTPUT)
     # Create the python file
-    fact.create_pyfile(em, LeDataSourceSQL, {})
+    fact.create_pyfile(em)
 
 
 def db_init():
     from EditorialModel.backend.json_backend import EmBackendJson
     from EditorialModel.model import Model
-    mh = getattr(migrationhandler,Settings.mh_classname)()
+    import DataSource.utils
+    mh = DataSource.utils.get_migrationhandler_instance()
     em = Model(EmBackendJson(Settings.em_file))
     em.migrate_handler(mh)
 

settings.py

@@ -14,8 +14,10 @@ plugins = ['dummy', 'dummy_auth']
 
 ds_package = 'dummy'
 datasource_options = {}
-""" #example
-datasource = {
+migrationhandler_options = {}
+""" # MySQL example
+ds_package = 'MySQL'
+datasource_options = {
     'default': {
         'module':pymysql,
         'host': None,
@@ -24,13 +26,13 @@ datasource = {
         'db': None,
     }
 }
-"""
 
-migration_options = {
+migrationhandler_options = {
     'dryrun': False,
     'foreign_keys': True,
     'drop_if_exists': False,
 }
+"""
 
 em_graph_format = 'png'
 em_graph_output = '/tmp/em_%s_graph.png'