[#61] Moved ledatasource into dummy

leobject/datasources/dummy.py

@@ -7,39 +7,43 @@
 
 class DummyDatasource(object):
 
-    def __init__(self, options=None):
-        self.options = options
+    def __init__(self, module=None, *conn_args, **conn_kargs):
+        self.module = module
+        self.conn_args = conn_args
+        self.conn_kargs = conn_kargs
+
+    ## @brief update an existing LeObject
+    # @param lodel_id (int) : list of lodel_id
+    # @param checked_data dict
+    # @param datasource_filters (string)
+    def update(self, lodel_id, checked_data, datasource_filters):
+        print ("DummyDatasource.update: ", lodel_id, checked_data, datasource_filters)
+        return True
 
     ## @brief create a new LeObject
+    # @param typename string
+    # @param classname string
     # @param data dict: a dictionnary of field:value to save
     # @return lodel_id int: new lodel_id of the newly created LeObject
-    def insert(self, data):
-        print("DummyDatasource.insert: ", data)
+    def insert(self, typename, classname, **datas):
+        print("DummyDatasource.insert: ", typename, classname, datas)
         return 42
 
-    ## @brief update an existing LeObject
-    # @param lodel_id int | (int): lodel_id of the object(s) where to apply changes
-    # @param data dict: dictionnary of field:value to save
-    # @param update_filters string | (string): list of string of update filters
-    # @return okay bool: True on success, it will raise on failure
-    def update(self, lodel_id, data, update_filters=None):
-        print("DummyDatasource.update: ", lodel_id, data, update_filters)
-
-        return True
-
     ## @brief delete an existing LeObject
     # @param lodel_id int | (int): lodel_id of the object(s) to delete
     # @param delete_filters string | (string): list of string of delete filters
     # @return okay bool: True on success, it will raise on failure
     def delete(self, lodel_id, delete_filters=None):
         print("DummyDatasource.delete: ", lodel_id, delete_filters)
-
         return True
 
-    ## @brief make a search to retrieve a collection of LeObject
-    # @param query_filters string | (string): list of string of query filters
+    ## @brief search for a collection of objects
+    # @param emclass LeClass : LeClass instance
+    # @param emtype LeType : LeType instance
+    # @param field_list list : list of fields to get from the datasource
+    # @param filters list : list of tuples formatted as (FIELD, OPERATOR, VALUE)
+    # @param relational_filters
     # @return responses ({string:*}): a list of dict with field:value
-    def get(self, query_filters):
-        print("DummyDatasource.get: ", query_filters)
-
-        return False
+    def get(self, emclass, emtype, field_list, filters, relational_filters):
+        print("DummyDatasource.get: ", emclass, emtype, field_list, filters, relational_filters)
+        return []

leobject/datasources/ledatasource.py

@@ -1,39 +0,0 @@
-#-*- coding: utf-8 -*-
-
-## Generic DataSource for LeObject
-
-class LeDataSource(object):
-
-    def __init__(self, module=None, *conn_args, **conn_kargs):
-        self.module = module
-        self.conn_args = conn_args
-        self.conn_kargs = conn_kargs
-
-    ## @brief update an existing LeObject
-    # @param lodel_id (int) : list of lodel_id
-    # @param checked_data dict
-    # @param datasource_filters (string)
-    def update(self, lodel_id, checked_data, datasource_filters):
-        return True
-
-    ## @brief insert
-    # @param typename string
-    # @param classname string
-    # @param **datas dict
-    def insert(self, typename, classname, **datas):
-        return True
-
-    ## @brief delete
-    # @param lodel_id (int) : list of lode_id(s) to delete
-    def delete(self, lodel_id):
-        return True
-    
-    ## @brief search for a collection of objects
-    # @param emclass LeClass : LeClass instance
-    # @param emtype LeType : LeType instance
-    # @param field_list list : list of fields to get from the datasource
-    # @param filters list : list of tuples formatted as (FIELD, OPERATOR, VALUE)
-    # @param relational_filters
-    def get(self, emclass, emtype, field_list, filters, relational_filters):
-        return {}
-

leobject/datasources/ledatasourcesql.py

@@ -1,13 +1,13 @@
 #-*- coding: utf-8 -*-
 
-from ledatasource import LeDataSource
+from leobject.datasources.dummy import DummyDatasource
 from mosql.db import Database, all_to_dicts
 from mosql.query import select
 
 from Lodel.utils.mosql import *
 
 ## SQL DataSource for LeObject
-class LeDataSourceSQL(LeDataSource):
+class LeDataSourceSQL(DummyDatasource):
 
     def __init__(self, module=None, *conn_args, **conn_kargs):
         super(LeDataSourceSQL, self).__init__()