Fix for ticket #62: Quoting in SqlBuilder

KrisJordan · Feb 16, 2009 · 2c3b1a0 · 2c3b1a0
1 parent 077dc79
commit 2c3b1a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/recess/lib/recess/database/sql/SqlBuilder.class.php b/recess/lib/recess/database/sql/SqlBuilder.class.php
@@ -50,7 +50,7 @@ public function insert() {
 		foreach($this->assignments as $assignment) {
 			if($first) { $first = false; }
 			else { $columns .= ', '; $values .= ', '; }
-			$columns .= str_replace($table_prefix, '', $assignment->column);
+			$columns .= '`' . str_replace($table_prefix, '', $assignment->column) . '`';
 			$values .= $assignment->getQueryParameter();
 		}
 		$columns = ' (' . $columns . ')';
@@ -162,7 +162,7 @@ public function update() {
 		foreach($this->assignments as $assignment) {
 			if($first) { $first = false; }
 			else { $sql .= ', '; }
-			$sql .= str_replace($table_prefix, '', $assignment->column) . ' = ' . $assignment->getQueryParameter();
+			$sql .= '`' . str_replace($table_prefix, '', $assignment->column) . '` = ' . $assignment->getQueryParameter();;
 		}
 
 		$sql .= $this->whereHelper();
@@ -571,6 +571,7 @@ protected function whereHelper() {
 	protected function joinHelper() {
 		$sql = '';
 		if(!empty($this->joins)) {
+			$this->joins = array_reverse($this->joins, true);
 			foreach($this->joins as $join) {
 				$joinStatement = '';
 

diff --git a/recess/test/lib/recess/database/sql/SelectSqlBuilderTest.class.php b/recess/test/lib/recess/database/sql/SelectSqlBuilderTest.class.php
@@ -82,13 +82,13 @@ function testLeftOuterJoin() {
 
 	function testInsert() {
 		$this->builder->into('authors')->assign('first_name','Kris');
-		$expected = 'INSERT INTO authors (first_name) VALUES (:assgn_authors_first_name)';
+		$expected = 'INSERT INTO authors (`first_name`) VALUES (:assgn_authors_first_name)';
 		$this->assertEqual($this->builder->insert(),$expected);
 	}
 
 	function testUpdate() {
 		$this->builder->table('authors')->equal('id',1)->assign('first_name','John');
-		$expected = 'UPDATE authors SET first_name = :assgn_authors_first_name WHERE authors.id  =  1';
+		$expected = 'UPDATE authors SET `first_name` = :assgn_authors_first_name WHERE authors.id  =  1';
 		$this->assertEqual($this->builder->update(),$expected);
 	}