Release version 1.9.7

FaaPz · Feb 27, 2016 · 34fd4db · 34fd4db
1 parent 8dc5d55
commit 34fd4db
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ### Changelog
 
+##### v1.9.7
++ Updated `WhereClause` class with:
+  - Fixed some weird bug in `__toString()` method
++ Updated `HavingClause` class with:
+  - Fixed the same weird bug in`__toString()` method
+
+> Mentioned by [EliaRigo](https://github.com/EliaRigo). Thanks!
+
 ##### v1.9.6
 + Updated `LimitClause` class with:
   - Fixed `limit()` method

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "slim/pdo",
     "description": "PDO database library for Slim Framework",
-    "version": "1.9.6",
+    "version": "1.9.7",
     "type": "library",
     "keywords": ["pdo", "database", "slim", "framework"],
     "homepage": "https://github.com/FaaPz/Slim-PDO",

diff --git a/src/PDO/Clause/HavingClause.php b/src/PDO/Clause/HavingClause.php
@@ -102,6 +102,6 @@ public function __toString()
             $args[] = $having;
         }
 
-        return ' HAVING '.ltrim(implode('', $args), 'AND ');
+        return ' HAVING '.ltrim(preg_replace('/AND/', '', implode('', $args)));
     }
 }
diff --git a/src/PDO/Clause/WhereClause.php b/src/PDO/Clause/WhereClause.php
@@ -227,6 +227,6 @@ public function __toString()
             $args[] = $where;
         }
 
-        return ' WHERE '.ltrim(implode('', $args), 'AND ');
+        return ' WHERE '.ltrim(preg_replace('/AND/', '', implode('', $args)));
     }
 }