Update datasource tests (deleted test concerning multivalue fields) + add an utility method in DataSource/MySQL/fieldtypes.py

DataSource/MySQL/fieldtypes.py

@@ -13,6 +13,7 @@ import EditorialModel.fieldtypes.char
 import EditorialModel.fieldtypes.bool
 import EditorialModel.fieldtypes.text
 import EditorialModel.fieldtypes.rel2type
+import EditorialModel.fieldtypes.leo
 
 ## @brief Returns column specs from fieldtype
 # @param emfieldtype EmFieldType : An EmFieldType insance
@@ -73,6 +74,10 @@ def fieldtype_db_init(fieldtype, noauto_inc = False):
     else:
         raise NotImplementedError("Not yet implemented")
     return tuple(res)
-            
-    
+
+## @brief Cast a value given a fieldtype
+def fieldtype_cast(fieldtype, value):
+    if isinstance(fieldtype, EditorialModel.fieldtypes.leo.EmFieldType):
+        return value.uidget()
+    return value
 

DataSource/MySQL/test/test_datasource.py

@@ -191,92 +191,6 @@ class DataSourceTestCase(TestCase):
                     'joins':None, #Expected call on Query.__call__ (called when we call left_join)
                 }
             ),
-            # call Article.select(fields = ['lodel_id', 'titre'], filters = ['lodel_id = 42'])
-            (
-                {
-                    'leobject': [lodel_id],
-                    'leclass': ['titre'],
-                },
-                {
-                    'target_cls': Article,
-                    'filters': [ (lodel_id, '=', 42) ],
-                    'rel_filters': [],
-                },
-                {
-                    'where': {
-                        (
-                            db_utils.column_prefix(table_names[LeObject], lodel_id),
-                            '=',
-                        ): 42
-                    },
-                    'joins': call(
-                        table_names[Article],
-                        {join_lodel_id: cls_lodel_id(Article)}
-                    ),
-                }
-            ),
-            # call Article.select(fields = ['lodel_id', 'titre'], filters = ['lodel_id = 42', 'soustitre = "foobar"'])
-            (
-                {
-                    'leobject': [lodel_id],
-                    'leclass': ['titre'],
-                },
-                {
-                    'target_cls': Article,
-                    'filters': [
-                        (lodel_id, '=', 42),
-                        ('soustitre', '=', 'foobar'),
-                    ],
-                    'rel_filters': [],
-                },
-                {
-                    'where': {
-                        (
-                            db_utils.column_prefix(table_names[LeObject], lodel_id),
-                            '=',
-                        ): 42,
-                        (
-                            db_utils.column_prefix(table_names[Article], 'soustitre'),
-                            '=',
-                        ): 'foobar',
-                    },
-                    'joins': call(
-                        table_names[Article],
-                        {join_lodel_id: cls_lodel_id(Article)}
-                    ),
-                }
-            ),
-            # call Textes.select(fields = ['lodel_id', 'titre'], filters = ['lodel_id = 42', 'soustitre = "foobar"'])
-            (
-                {
-                    'leobject': [lodel_id],
-                    'leclass': ['titre'],
-                },
-                {
-                    'target_cls': Article,
-                    'filters': [
-                        (lodel_id, '=', 42),
-                        ('soustitre', '=', 'foobar'),
-                    ],
-                    'rel_filters': [],
-                },
-                {
-                    'where': {
-                        (
-                            db_utils.column_prefix(table_names[LeObject], lodel_id),
-                            '=',
-                        ): 42,
-                        (
-                            db_utils.column_prefix(table_names[Textes], 'soustitre'),
-                            '=',
-                        ): 'foobar',
-                    },
-                    'joins': call(
-                        table_names[Textes],
-                        {join_lodel_id: cls_lodel_id(Textes)}
-                    ),
-                }
-            ),
         ]
 
         # mock the database module to avoid connection tries