From: Andrey Kutejko <andy128k@gmail.com>
Date: Sat, 27 Jul 2013 06:47:38 +0000 (+0300)
Subject: minor refactoring
X-Git-Tag: 0.5~140
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=4f7a5e55bad8e8a1b615449957a85dfa860347fa;p=ipf.git

minor refactoring
---

diff --git a/ipf/orm/datadict.php b/ipf/orm/datadict.php
index 77bcdc6..56a2098 100644
--- a/ipf/orm/datadict.php
+++ b/ipf/orm/datadict.php
@@ -36,15 +36,5 @@ class IPF_ORM_DataDict extends IPF_ORM_Connection_Module
 
         return $change;
     }
+}
 
-    public function parseBoolean($value)
-    {
-        // parse booleans
-        if ($value == 'true') {
-            $value = 1;
-        } elseif ($value == 'false') {
-            $value = 0;
-        }
-        return $value;
-    }
-}
\ No newline at end of file
diff --git a/ipf/orm/query/condition.php b/ipf/orm/query/condition.php
index 5a93f51..b18e9eb 100644
--- a/ipf/orm/query/condition.php
+++ b/ipf/orm/query/condition.php
@@ -43,13 +43,23 @@ abstract class IPF_ORM_Query_Condition extends IPF_ORM_Query_Part
         return '(' . $r . ')';
     }
 
+    private function parseBoolean($value)
+    {
+        // parse booleans
+        if ($value == 'true') {
+            $value = 1;
+        } elseif ($value == 'false') {
+            $value = 0;
+        }
+        return $value;
+    }
+
     public function parseLiteralValue($value)
     {
         // check that value isn't a string
         if (strpos($value, '\'') === false) {
             // parse booleans
-            $value = $this->query->getConnection()
-                     ->dataDict->parseBoolean($value);
+            $value = $this->parseBoolean($value);
 
             $a = explode('.', $value);
 
@@ -68,4 +78,4 @@ abstract class IPF_ORM_Query_Condition extends IPF_ORM_Query_Part
         }
         return $value;
     }
-}
\ No newline at end of file
+}