@@ -8,12 +8,8 @@ * Function: build_update_values * Creates an update data part. */ - public static function build_update_values($data) { - $set = array(); - - foreach ($data as $field => $val) - array_push($set, "$field = $val"); - + public static function build_update_values($data, &$params = array()) { + $set = self::build_conditions($data, $params); return implode(", ", $set); } @@ -71,7 +67,7 @@ public static function build_update($table, $conds, $data, &$params = array()) { return " UPDATE __$table - SET ".self::build_update_values($data)." + SET ".self::build_update_values($data, $params)." ".($conds ? "WHERE ".self::build_where($conds, $table, $params) : "")." "; } @@ -185,42 +181,48 @@ return implode(", ", $order); } - public static function build_conditions($conds, &$params, $tables) { + public static function build_conditions($conds, &$params, $tables = null) { foreach ($conds as $key => $val) { if (is_numeric($key)) # Full expression $cond = $val; else { # Key => Val expression - if (substr($key, -4) == " not") { # Negation - $key = substr($key, 0, -4); - if (is_array($val)) - $cond = $key." NOT IN ".self::build_in($val); - elseif ($val === null) - $cond = $key." IS NOT NULL"; - else { - $cond = $key." != :".$key; + if (is_string($val) and $val[0] == ":") + $cond = $key." = ".$val; + else { + if (substr($key, -4) == " not") { # Negation + $key = substr($key, 0, -4); + if (is_array($val)) + $cond = $key." NOT IN ".self::build_in($val); + elseif ($val === null) + $cond = $key." IS NOT NULL"; + else { + $cond = $key." != :".$key; + $params[":".$key] = $val; + } + } elseif (substr($key, -5) == " like") { # LIKE + $key = substr($key, 0, -5); + $cond = $key." LIKE :".$key; $params[":".$key] = $val; - } - } elseif (substr($key, -5) == " like") { # LIKE - $key = substr($key, 0, -5); - $cond = $key." LIKE :".$key; - $params[":".$key] = $val; - } elseif (substr($key, -9) == " not like") { # NOT LIKE - $key = substr($key, 0, -9); - $cond = $key." NOT LIKE :".$key; - $params[":".$key] = $val; - } else { # Equation - if (is_array($val)) - $cond = $key." IN ".self::build_in($val); - elseif ($val === null) - $cond = $key." IS NULL"; - else { - $cond = $key." = :".$key; + } elseif (substr($key, -9) == " not like") { # NOT LIKE + $key = substr($key, 0, -9); + $cond = $key." NOT LIKE :".$key; $params[":".$key] = $val; + } else { # Equation + if (is_array($val)) + $cond = $key." IN ".self::build_in($val); + elseif ($val === null) + $cond = $key." IS NULL"; + else { + $cond = $key." = :".$key; + $params[":".$key] = $val; + } } } } - self::tablefy($cond, $tables); + if ($tables) + self::tablefy($cond, $tables); + $conditions[] = $cond; } includes/class/QueryBuilder.php @@ -314,12 +314,9 @@ $sql->delete("tags", array("id" => $tag["id"])); else $sql->update("tags", - "id = :id", - array("tags" => ":tags", - "clean" => ":clean"), - array(":id" => $tag["id"], - ":tags" => join(",", $names), - ":clean" => join(",", $cleans))); + array("id" => $tag["id"]), + array("tags" => join(",", $names), + "clean" => join(",", $cleans))); } Flash::notice(__("Tag deleted.", "tags"), "/admin/?action=manage_tags"); modules/tags/tags.php 0ab14775db15b0805c1f2192b79edcc6247ad196 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/5563f88b0bc792af119d65e58943ccc949705f19 5563f88b0bc792af119d65e58943ccc949705f19 2008-09-01T10:39:40-07:00 2008-09-01T10:39:40-07:00 * More SQL interfacing improvements * Use condition building for update/insert queries * $tables arg is now optional in QueryBuilder::build_conditions 41b198d7cce6475afd6ff99065cd5555a2b527ed Alex Suraci i.am@toogeneric.com