From bdd85d9bdea957d3968fc5a4398a138c804c6b40 Mon Sep 17 00:00:00 2001
From: Yann <yann.weber@openedition.org>
Date: Fri, 30 Oct 2015 14:18:57 +0100
Subject: [PATCH] Implement the LeDatasource.insert() method + user friendly
 LeObject.insert() datas arg

---
 leobject/datasources/ledatasourcesql.py | 32 +++++++++++++++++++------
 leobject/leobject.py                    |  3 +++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/leobject/datasources/ledatasourcesql.py b/leobject/datasources/ledatasourcesql.py
index dc72645..942ae02 100644
--- a/leobject/datasources/ledatasourcesql.py
+++ b/leobject/datasources/ledatasourcesql.py
@@ -32,13 +32,31 @@ class LeDataSourceSQL(DummyDatasource):
     # @return int : lodel_id of the created object
     # @todo add the returning clause and the insertion in "object"
     def insert(self, letype, leclass, datas):
-        query_table_name = self._get_table_name_from_class_name(leclass.__name__)
+        if isinstance(datas, list):
+            res = list()
+            for data in datas:
+                res.append(self.insert(letype, leclass, data))
+        elif isinstance(datas, dict):
+            
+            with self.connection as cur:
+                object_datas = {'class_id': leclass._class_id, 'type_id': letype._type_id}
+                if cur.execute(insert(self.OBJECTS_TABLE_NAME, object_datas)) != 1:
+                    raise RuntimeError('SQL error')
+                    
+                if cur.execute('SELECT last_insert_id() as lodel_id') != 1:
+                    raise RuntimeError('SQL error')
+                    
+                lodel_id, = cur.fetchone()
 
-        query = insert(query_table_name, datas)
-        with self.connection as cur:
-            cur.execute(query)
+                print("Object inserted : %s with lodel_id %s"%(object_datas, lodel_id))
+                datas[self.LODEL_ID_FIELD] = lodel_id
+                query_table_name = self._get_table_name_from_class_name(leclass.__name__)
+                query = insert(query_table_name, datas)
 
-        return True
+                if cur.execute(query) != 1:
+                    raise RuntimeError('SQL error')
+
+            return lodel_id
 
     ## @brief search for a collection of objects
     # @param leclass LeClass
@@ -145,7 +163,7 @@ class LeDataSourceSQL(DummyDatasource):
     # @params classname str
     # @return str
     def _get_table_name_from_class_name(self, classname):
-        return classname if self.CLASS_TABLE_PREFIX in classname else "%s%s" % (self.CLASS_TABLE_PREFIX, classname)
+        return (classname if self.CLASS_TABLE_PREFIX in classname else "%s%s" % (self.CLASS_TABLE_PREFIX, classname)).lower()
 
     ## @brief prepares the relational filters
     # @params rel_filters : (("superior"|"subordinate"), operator, value)
@@ -179,4 +197,4 @@ class LeDataSourceSQL(DummyDatasource):
                 prepared_filter_value = filter_item[2]
                 prepared_filters[prepared_filter_key] = prepared_filter_value
 
-        return prepared_filters
\ No newline at end of file
+        return prepared_filters
diff --git a/leobject/leobject.py b/leobject/leobject.py
index 6fabb7d..f425de6 100644
--- a/leobject/leobject.py
+++ b/leobject/leobject.py
@@ -54,6 +54,9 @@ class _LeObject(object):
     # @see leobject.datasources.dummy.DummyDatasource.insert(), leobject.letype.LeType.insert()
     @classmethod
     def insert(cls, letype, datas):
+        if isinstance(datas, dict):
+            datas = [datas]
+
         if cls == _LeObject:
             raise NotImplementedError("Abstract method")
         letype,leclass = cls._prepare_targets(letype)