group for SQL group not groups

DataSource/MySQL/leapidatasource.py

@@ -62,6 +62,17 @@ class LeDataSourceSQL(DummyDatasource):
             joins = [left_join(class_table, {main_lodel_id:class_lodel_id})]
             fields = [(main_table, common_fields), (class_table, main_class.fieldlist())]
 
+        elif target_cls.is_lehierarch():
+            main_table = self.datasource_utils.relations_table_name
+            print(field_list)
+            field_list = target_cls.name2class('LeRelation').fieldlist()
+            print(field_list)
+            fields = [(main_table, relations_common_fields)]
+        elif target_cls.is_lerel2type():
+            pass
+        else:
+            raise AttributeError("Target class '%s' in get() is not a Lodel Editorial Object !" % target_cls)
+
         # prefix column name in fields list
         prefixed_field_list = [self.datasource_utils.find_prefix(name, fields) for name in field_list]
 
@@ -90,7 +101,7 @@ class LeDataSourceSQL(DummyDatasource):
         # prefix filters'' column names, and prepare dict for mosql where {(fieldname, op): value}
         wheres = {(self.datasource_utils.find_prefix(name, fields), op):value for name,op,value in filters}
         query = select(main_table, select=prefixed_field_list, where=wheres, joins=joins, **kwargs)
-        #print ('SQL', query)
+        print ('SQL', query)
 
         # Executing the query
         cur = self.datasource_utils.query(self.connection, query)

leapi/leclass.py

@@ -37,6 +37,6 @@ class _LeClass(_LeObject):
         return cls.fieldtypes().keys()
 
     @classmethod
-    def get(cls, query_filters, field_list=None, order=None, groups=None, limit=None, offset=0):
+    def get(cls, query_filters, field_list=None, order=None, group=None, limit=None, offset=0):
         query_filters.append(('class_id', '=', cls._class_id))
-        return super().get(query_filters, field_list, order=order, groups=groups, limit=limit, offset=offset)
+        return super().get(query_filters, field_list, order=order, group=group, limit=limit, offset=offset)

leapi/lecrud.py

@@ -260,7 +260,7 @@ class _LeCrud(object):
     # @return A list of lodel editorial components instance
     # @todo think about LeObject and LeClass instanciation (partial instanciation, etc)
     @classmethod
-    def get(cls, query_filters, field_list=None, order=None, groups=None, limit=None, offset=0):
+    def get(cls, query_filters, field_list=None, order=None, group=None, limit=None, offset=0):
         if field_list is None or len(field_list) == 0:
             #default field_list
             field_list = cls.fieldlist()
@@ -277,10 +277,10 @@ class _LeCrud(object):
                 raise order #can be buffered and raised later, but _prepare_filters raise when fails
 
         #preparing groups
-        if groups:
-            groups = cls._prepare_order_fields(groups)
-            if isinstance(groups, Exception):
-                raise groups # can also be buffered and raised later
+        if group:
+            group = cls._prepare_order_fields(group)
+            if isinstance(group, Exception):
+                raise group # can also be buffered and raised later
 
         #checking limit and offset values
         if not (limit is None):
@@ -297,7 +297,7 @@ class _LeCrud(object):
                                             filters = filters,
                                             rel_filters = relational_filters,
                                             order=order,
-                                            groups=groups,
+                                            group=group,
                                             limit=limit,
                                             offset=offset
                                         )

leapi/letype.py

@@ -65,9 +65,9 @@ class _LeType(_LeClass):
         return cls._fields
 
     @classmethod
-    def get(cls, query_filters, field_list = None, order = None, groups = None, limit = None, offset = 0):
+    def get(cls, query_filters, field_list = None, order = None, group = None, limit = None, offset = 0):
         query_filters.append(('type_id', '=', cls._type_id))
-        return super().get(query_filters, field_list, order, groups, limit, offset)
+        return super().get(query_filters, field_list, order, group, limit, offset)
 
     @classmethod
     def fieldtypes(cls):

leapi/test/test_lecrud.py

@@ -305,7 +305,7 @@ class LeCrudTestCase(TestCase):
                                         filters = filters_ds,
                                         rel_filters = rfilters_ds,
                                         order=None,
-                                        groups=None,
+                                        group=None,
                                         limit=None,
                                         offset=0
                                     )
@@ -322,7 +322,7 @@ class LeCrudTestCase(TestCase):
                 {
                     'query_filters': [],
                     'field_list': ['lodel_id'],
-                    'groups': ['titre'],
+                    'group': ['titre'],
                     'limit': 10,
 
                 },
@@ -331,7 +331,7 @@ class LeCrudTestCase(TestCase):
                     'field_list': ['lodel_id'],
                     'filters': [],
                     'rel_filters': [],
-                    'groups': [('titre', 'ASC')],
+                    'group': [('titre', 'ASC')],
                     'order': None,
                     'limit': 10,
                     'offset': 0,
@@ -351,7 +351,7 @@ class LeCrudTestCase(TestCase):
                     'field_list': ['lodel_id'],
                     'filters': [],
                     'rel_filters': [((leapi.lecrud.REL_SUP, 'parent'), '=', '20')],
-                    'groups': None,
+                    'group': None,
                     'order': [('titre', 'ASC'), ('lodel_id', 'DESC')],
                     'limit': None,
                     'offset': 1024,
@@ -365,7 +365,7 @@ class LeCrudTestCase(TestCase):
                     'offset': 1024,
                     'limit': 2,
                     'order': ['titre', ('lodel_id', 'desc')],
-                    'groups': ['titre'],
+                    'group': ['titre'],
 
                 },
                 {
@@ -373,7 +373,7 @@ class LeCrudTestCase(TestCase):
                     'field_list': ['lodel_id'],
                     'filters': [],
                     'rel_filters': [((leapi.lecrud.REL_SUP, 'parent'), '=', '20')],
-                    'groups': [('titre', 'ASC')],
+                    'group': [('titre', 'ASC')],
                     'order': [('titre', 'ASC'), ('lodel_id', 'DESC')],
                     'limit': 2,
                     'offset': 1024,