From 673d8b13da87309044df8844979e40f6f8d046fa Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Thu, 10 Jan 2013 11:25:29 +0100
Subject: [PATCH] reimplemeting parsing return query

---
 core/lib/Thelia/Core/Template/Parser.php |  6 +++++-
 core/lib/Thelia/Model/Base/Base.php      | 21 ++++++++++++++-------
 core/lib/Thelia/Model/Config.php         |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Parser.php b/core/lib/Thelia/Core/Template/Parser.php
index 021740896..4ec29bed6 100644
--- a/core/lib/Thelia/Core/Template/Parser.php
+++ b/core/lib/Thelia/Core/Template/Parser.php
@@ -80,7 +80,11 @@ class Parser implements ParserInterface
 
        $config = $this->container->get("model.config");
 
-       var_dump($config->read("tlog_niveau","tutu"));
+       $results = $config->find(1);
+
+       var_dump($results->delete());
+
+
 
        return $this->content;
     }
diff --git a/core/lib/Thelia/Model/Base/Base.php b/core/lib/Thelia/Model/Base/Base.php
index 43e6dff59..d6fa62823 100644
--- a/core/lib/Thelia/Model/Base/Base.php
+++ b/core/lib/Thelia/Model/Base/Base.php
@@ -203,13 +203,15 @@ abstract class Base
      * Find record by primary key
      *
      * @param  int            $pk
-     * @return \NotORM_Result
+     * @return Object
      */
     public function find($pk)
     {
         $table = $this->getTable();
 
-        return $this->getConnection()->$table()->where("id", $pk);
+        $result =  $this->getConnection()->$table()->where("id", $pk);
+
+         return $this->parseOneQuery($result);
     }
 
     /**
@@ -218,7 +220,7 @@ abstract class Base
      *
      * @param  mixed                     $column column name
      * @param  mixed                     $search value searching
-     * @return \NotORM_Result
+     * @return array
      * @throws \InvalidArgumentException column name cannot be empty
      */
     public function findBy($column, $search)
@@ -241,7 +243,7 @@ abstract class Base
      *
      * @param  mixed                     $column column name
      * @param  mixed                     $search value searching
-     * @return \NotORM_Result
+     * @return Object
      * @throws \InvalidArgumentException column name cannot be empty
      */
     public function findOneBy($column, $search)
@@ -255,9 +257,7 @@ abstract class Base
 
         $result =  $this->getConnection()->$table()->where($column, $search)->limit(1);
 
-        $return = $this->parseQuery($result);
-
-        return count($return) ? $return[0] : null ;
+        return $this->parseOneQuery($result);
     }
 
     public function delete()
@@ -297,6 +297,13 @@ abstract class Base
         return $return;
     }
 
+    private function parseOneQuery(\NotORM_Result $results)
+    {
+        $return = $this->parseQuery($results);
+
+        return count($return) ? $return[0] : null ;
+    }
+
     /**
      *
      * prepare an array for persisting data
diff --git a/core/lib/Thelia/Model/Config.php b/core/lib/Thelia/Model/Config.php
index f7a4da036..0098c7c01 100644
--- a/core/lib/Thelia/Model/Config.php
+++ b/core/lib/Thelia/Model/Config.php
@@ -23,6 +23,6 @@ class Config extends Base
     {
        $result = $this->findOneBy("name",$search);
 
-       return $result ? $result->value : $default;
+       return $result ? $result->getValue() : $default;
     }
 }