From 74178a55960fbc2b8eac665912c3fd46883e63c3 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Fri, 19 Jun 2009 11:03:24 +0000
Subject: [PATCH] - DibiTranslator: added brackets for %and %or (thanks to Jiri
 Sutera) - DibiMySqlDriver: added common error constants

---
 dibi/dibi.php                | 2 +-
 dibi/drivers/mysql.php       | 4 ++++
 dibi/drivers/mysqli.php      | 4 ++++
 dibi/libs/DibiTranslator.php | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dibi/dibi.php b/dibi/dibi.php
index e5c9d1bd..3b53469a 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -693,7 +693,7 @@ class dibi
 			static $keywords2 = 'ALL|DISTINCT|DISTINCTROW|AS|USING|ON|AND|OR|IN|IS|NOT|NULL|LIKE|TRUE|FALSE';
 
 			// insert new lines
-			$sql = ' ' . $sql;
+			$sql = " $sql ";
 			$sql = preg_replace("#(?<=[\\s,(])($keywords1)(?=[\\s,)])#i", "\n\$1", $sql);
 
 			// reduce spaces
diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php
index e366c3fb..8bb7843c 100644
--- a/dibi/drivers/mysql.php
+++ b/dibi/drivers/mysql.php
@@ -43,6 +43,10 @@
  */
 class DibiMySqlDriver extends DibiObject implements IDibiDriver
 {
+	const ERROR_ACCESS_DENIED = 1045;
+	const ERROR_DUPLICATE_ENTRY = 1062;
+	const ERROR_DATA_TRUNCATED = 1265;
+
 	/** @var resource  Connection resource */
 	private $connection;
 
diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php
index 911cb37c..9236f794 100644
--- a/dibi/drivers/mysqli.php
+++ b/dibi/drivers/mysqli.php
@@ -43,6 +43,10 @@
  */
 class DibiMySqliDriver extends DibiObject implements IDibiDriver
 {
+	const ERROR_ACCESS_DENIED = 1045;
+	const ERROR_DUPLICATE_ENTRY = 1062;
+	const ERROR_DATA_TRUNCATED = 1265;
+
 	/** @var mysqli  Connection resource */
 	private $connection;
 
diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php
index 6bb16f24..e3950113 100644
--- a/dibi/libs/DibiTranslator.php
+++ b/dibi/libs/DibiTranslator.php
@@ -234,7 +234,7 @@ final class DibiTranslator extends DibiObject
 						$vx[] = $this->formatValue($v, 'ex');
 					}
 				}
-				return implode(' ' . strtoupper($modifier) . ' ', $vx);
+				return '(' . implode(') ' . strtoupper($modifier) . ' (', $vx) . ')';
 
 			case 'n':  // identifier names
 				foreach ($value as $k => $v) {