GH-40 SQLBuilder should prepend table name to fields in apply_where_conditions if any joins have been specified

Author: jpfuentes2

lib/SQLBuilder.php

@@ -271,14 +271,36 @@ public static function create_hash_from_underscored_string($name, &$values=array
 		return $hash;
 	}
 
+	/**
+	 * prepends table name to hash of field names to get around ambiguous fields when SQL builder
+	 * has joins
+	 *
+	 * @param array $hash
+	 * @return array $new
+	 */
+	private function prepend_table_name_to_fields($hash=array())
+	{
+		$new = array();
+		$table = $this->connection->quote_name($this->table);
+
+		foreach ($hash as $key => $value)
+		{
+			$k = $this->connection->quote_name($key);
+			$new[$table.'.'.$k] = $value;
+		}
+
+		return $new;
+	}
+
 	private function apply_where_conditions($args)
 	{
 		require_once 'Expressions.php';
 		$num_args = count($args);
 
 		if ($num_args == 1 && is_hash($args[0]))
 		{
-			$e = new Expressions($this->connection,$args[0]);
+			$hash = is_null($this->joins) ? $args[0] : $this->prepend_table_name_to_fields($args[0]);
+			$e = new Expressions($this->connection,$hash);
 			$this->where = $e->to_s();
 			$this->where_values = array_flatten($e->values());
 		}
@@ -323,7 +345,7 @@ private function build_insert()
 		if ($this->sequence)
 		{
 			$sql =
-				"INSERT INTO $this->table($keys," . $this->connection->quote_name($this->sequence[0]) . 
+				"INSERT INTO $this->table($keys," . $this->connection->quote_name($this->sequence[0]) .
 				") VALUES(?," . $this->connection->next_sequence_value($this->sequence[1]) . ")";
 		}
 		else