Merge branch 'master' of git.labocleo.org:lodel2

Database/sqlsetup.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from Database.sqlwrapper import SqlWrapper
+import sqlalchemy as sql
 
 class SQLSetup(object): 
 
@@ -74,8 +75,8 @@ class SQLSetup(object):
         em_field['columns'] = default_columns + [
             {"name":"fieldtype",   "type":"VARCHAR(50)", "extra":{"nullable":False}},
             {"name":"fieldgroup_id",  "type":"INTEGER", "extra":{"foreignkey":"em_fieldgroup.uid", "nullable":False}},
-            {"name":"rel_to_type_id", "type":"INTEGER", "extra":{"foreignkey":"em_type.uid", "nullable":True, "default": None}}, # if relational: type this field refer to
-            {"name":"rel_field_id",   "type":"INTEGER", "extra":{"foreignkey":"em_type.uid", "nullable":True, "default": None}}, # if relational: field that specify the rel_to_type_id
+            {"name":"rel_to_type_id", "type":"INTEGER", "extra":{"foreignkey":"em_type.uid", "nullable":True, "server_default": sql.text('NULL')}}, # if relational: type this field refer to
+            {"name":"rel_field_id",   "type":"INTEGER", "extra":{"foreignkey":"em_type.uid", "nullable":True, "server_default": sql.text('NULL')}}, # if relational: field that specify the rel_to_type_id
             {"name":"optional",       "type":"BOOLEAN"},
             {"name":"internal",       "type":"BOOLEAN"},
             {"name":"icon",           "type":"INTEGER"},

Database/sqlwrapper.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 import re
-import logging as logger
+import logging
 
 import sqlalchemy as sqla
 from sqlalchemy.ext.compiler import compiles
@@ -10,7 +10,10 @@ from django.conf import settings
 from Database.sqlalter import *
 
 #Logger config
-logger.getLogger().setLevel('DEBUG')
+#logger.getLogger().setLevel('WARNING')
+logger = logging.getLogger('lodel2.Database.sqlwrapper')
+logger.setLevel('WARNING')
+logger.propagate = False
 #To be able to use dango confs
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Lodel.settings")
 

EditorialModel/classes.py

@@ -29,25 +29,21 @@ class EmClass(EmComponent):
     @classmethod
     def create(c, name, class_type):
         try:
-            exists = EmClass(name)
+            res = EmClass(name)
             logger.info("Trying to create an EmClass that allready exists")
         except EmComponentNotExistError:
-            return c._createDb(name, class_type)
+            res = c._createDb(name, class_type)
+            logger.debug("EmClass successfully created")
 
-        return exists
+        return res
 
     @classmethod
     def _createDb(c, name, class_type):
         """ Do the db querys for EmClass::create() """
+        uid = c.newUid()
+
         dbe = c.getDbE()
-        #Create a new uid
-        uids = sql.Table('uids', sqlutils.meta(dbe))
         conn = dbe.connect()
-        req = uids.insert(values={'table':c.table})
-        res = conn.execute(req)
-
-        uid = res.inserted_primary_key[0]
-
         #Create a new entry in the em_class table
         dbclass = sql.Table(c.table, sqlutils.meta(dbe))
         req = dbclass.insert().values(uid = uid, name=name, classtype=class_type['name'])

EditorialModel/components.py

@@ -15,7 +15,8 @@ logger = logging.getLogger('Lodel2.EditorialModel')
 class EmComponent(object):
 
     dbconf = 'default' #the name of the engine configuration
-
+    table = None
+    
     """ instaciate an EmComponent
         @param id_or_name int|str: name or id of the object
         @exception TypeError
@@ -133,6 +134,25 @@ class EmComponent(object):
         else:
             return "<%s #%s, '%s'>" % (type(self).__name__, self.id, self.name)
 
+    @classmethod
+    def newUid(c):
+        """ This function register a new component in uids table
+            @return The new uid
+        """
+        dbe = c.getDbE()
+
+        uidtable = sql.Table('uids', sqlutils.meta(dbe))
+        conn = dbe.connect()
+        req = uidtable.insert(values={'table':c.table})
+        res = conn.execute(req)
+
+        uid = res.inserted_primary_key[0]
+        logger.debug("Registering a new UID '"+str(uid)+"' for '"+c.table+"' component")
+
+        conn.close()
+
+        return uid
+
 
 class EmComponentNotExistError(Exception):
     pass

EditorialModel/fieldgroups.py

@@ -41,13 +41,10 @@ class EmFieldGroup(EmComponent):
     @classmethod
     def _createDb(c,name, em_class):
         """ Make the Db insertion for fieldgroup creation """
+        uid = c.newUid()
+
         dbe = c.getDbE()
-        #Create a new uid
-        uids = sql.Table('uids', sqlutils.meta(dbe))
         conn = dbe.connect()
-        req = uids.insert(values={'table': c.table})
-        res = conn.execute(req)
-        uid = res.inserted_primary_key
 
         req = sql.Table(c.table, sqlutils.meta(dbe)).insert().values(uid=uid, name=name, class_id=em_class.id)
         res = conn.execute(req)

EditorialModel/fields.py

@@ -57,14 +57,10 @@ class EmField(EmComponent):
     
     @classmethod
     def _createDb(c, values):
+        values['uid'] = c.newUid()
+
         dbe = c.getDbE()
-        #Create a new uid
-        uids = sql.Table('uids', sqlutils.meta(dbe))
         conn = dbe.connect()
-        req = uids.insert(values={'table':c.table})
-        res = conn.execute(req)
-
-        values['uid'] = res.inserted_primary_key
         req = sql.Table(c.table, sqlutils.meta(dbe)).insert(values=values)
         res = conn.execute(req)
 

EditorialModel/types.py

@@ -46,14 +46,10 @@ class EmType(EmComponent):
 
     @classmethod
     def _createDb(c, name, em_class):
+        uid = c.newUid()
+
         dbe = c.getDbE()
-        #Create a new uid
-        uids = sql.Table('uids', sqlutils.meta(dbe))
         conn = dbe.connect()
-        req = uids.insert(values={'table':c.table})
-        res = conn.execute(req)
-
-        uid = res.inserted_primary_key
 
         #Insert type in db
         dbtype = sql.Table(c.table, sqlutils.meta(dbe))