DibiTranslator: empty arrays DO NOT generate NULL (BC break!) & added…

… array modifier %in
Majkl578 · Jan 23, 2010 · e42df47 · e42df47
1 parent 0fcca77
commit e42df47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
@@ -33,7 +33,7 @@ class DibiFluent extends DibiObject implements IDataSource
 	public static $modifiers = array(
 		'SELECT' => '%n',
 		'FROM' => '%n',
-		'IN' => '%l',
+		'IN' => '%in',
 		'VALUES' => '%l',
 		'SET' => '%a',
 		'WHERE' => '%and',

diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php
@@ -218,7 +218,7 @@ public function formatValue($value, $modifier)
 
 						} else {
 							$v = $this->formatValue($v, $pair[1]);
-							$vx[] = $k . ($pair[1] === 'l' ? 'IN ' : ($v === 'NULL' ? 'IS ' : '= ')) . $v;
+							$vx[] = $k . ($pair[1] === 'l' || $pair[1] === 'in' ? 'IN ' : ($v === 'NULL' ? 'IS ' : '= ')) . $v;
 						}
 
 					} else {
@@ -248,12 +248,13 @@ public function formatValue($value, $modifier)
 				return implode(', ', $vx);
 
 
+			case 'in':// replaces scalar %in modifier!
 			case 'l': // (val, val, ...)
 				foreach ($value as $k => $v) {
 					$pair = explode('%', $k, 2); // split into identifier & modifier
 					$vx[] = $this->formatValue($v, isset($pair[1]) ? $pair[1] : (is_array($v) ? 'ex' : FALSE));
 				}
-				return '(' . ($vx ? implode(', ', $vx) : 'NULL') . ')';
+				return '(' . (($vx || $modifier === 'l') ? implode(', ', $vx) : 'NULL') . ')';
 
 
 			case 'v': // (key, key, ...) VALUES (val, val, ...)
@@ -287,7 +288,7 @@ public function formatValue($value, $modifier)
 					}
 				}
 				foreach ($vx as $k => $v) {
-					$vx[$k] = '(' . ($v ? implode(', ', $v) : 'NULL') . ')';
+					$vx[$k] = '(' . implode(', ', $v) . ')';
 				}
 				return '(' . implode(', ', $kx) . ') VALUES ' . implode(', ', $vx);
 
@@ -313,7 +314,7 @@ public function formatValue($value, $modifier)
 				foreach ($value as $v) {
 					$vx[] = $this->formatValue($v, $modifier);
 				}
-				return $vx ? implode(', ', $vx) : 'NULL';
+				return implode(', ', $vx);
 			}
 		}