@@ -22,20 +22,21 @@ class Expressions private $values = array(); private $connection; - public function __construct($expressions=null /* [, $values ... ] */) + public function __construct($connection, $expressions=null /* [, $values ... ] */) { $values = null; + $this->connection = $connection; if (is_array($expressions)) { - $glue = func_num_args() > 1 ? func_get_arg(1) : ' AND '; + $glue = func_num_args() > 2 ? func_get_arg(2) : ' AND '; list($expressions,$values) = $this->build_sql_from_hash($expressions,$glue); } if ($expressions != '') { if (!$values) - $values = array_slice(func_get_args(),1); + $values = array_slice(func_get_args(),2); $this->values = $values; $this->expressions = $expressions; @@ -89,7 +90,7 @@ class Expressions public function to_s($substitute=false, &$options=null) { if (!$options) $options = array(); - + $values = array_key_exists('values',$options) ? $options['values'] : $this->values; $ret = ""; @@ -126,6 +127,9 @@ class Expressions foreach ($hash as $name => $value) { + if ($this->connection) + $name = $this->connection->quote_name($name); + if (is_array($value)) $sql .= "$g$name IN(?)"; else lib/Expressions.php @@ -263,8 +263,7 @@ class SQLBuilder if ($num_args == 1 && is_hash($args[0])) { - $e = new Expressions($args[0]); - $e->set_connection($this->connection); + $e = new Expressions($this->connection,$args[0]); $this->where = $e->to_s(); $this->where_values = array_flatten($e->values()); } @@ -277,8 +276,7 @@ class SQLBuilder { if (is_array($value)) { - $e = new Expressions($args[0]); - $e->set_connection($this->connection); + $e = new Expressions($this->connection,$args[0]); $e->bind_values($values); $this->where = $e->to_s(); $this->where_values = array_flatten($e->values()); @@ -304,9 +302,9 @@ class SQLBuilder private function build_insert() { - $keys = join(',',array_keys($this->data)); - $e = new Expressions("INSERT INTO $this->table($keys) VALUES(?)",array_values($this->data)); - $e->set_connection($this->connection); + $keys = join(',',$this->quoted_key_names()); + + $e = new Expressions($this->connection,"INSERT INTO $this->table($keys) VALUES(?)",array_values($this->data)); return $e->to_s(); } @@ -337,7 +335,7 @@ class SQLBuilder private function build_update() { - $fields = array_keys($this->data); + $fields = $this->quoted_key_names(); $sql = "UPDATE $this->table SET " . join('=?, ',$fields) . '=?'; if ($this->where) @@ -345,5 +343,15 @@ class SQLBuilder return $sql; } + + private function quoted_key_names() + { + $keys = array(); + + foreach ($this->data as $key => $value) + $keys[] = $this->connection->quote_name($key); + + return $keys; + } } ?> \ No newline at end of file lib/SQLBuilder.php @@ -16,6 +16,13 @@ class ActiveRecordWriteTest extends DatabaseTest $this->assert_not_null(Author::find($author->id)); } + public function test_insert_should_quote_keys() + { + $author = new Author(array('name' => 'Blah Blah')); + $author->save(); + $this->assert_true(strpos($author->connection()->last_query,$author->connection()->quote_name('updated_at')) !== false); + } + public function test_save_auto_increment_id() { $venue = new Venue(array('name' => 'Bob')); @@ -53,6 +60,14 @@ class ActiveRecordWriteTest extends DatabaseTest $this->assert_same($new_name, $book->name, Book::find(1)->name); } + public function test_update_should_quote_keys() + { + $book = Book::find(1); + $book->name = 'new name'; + $book->save(); + $this->assert_true(strpos($book->connection()->last_query,$book->connection()->quote_name('name')) !== false); + } + public function test_update_attributes() { $book = Book::find(1); @@ -117,7 +132,8 @@ class ActiveRecordWriteTest extends DatabaseTest public function test_dirty_attributes_cleared_after_saving() { $book = $this->make_new_book_and(); - $this->assert_true(strpos($book->table()->last_sql,'(name,special)') !== false); + $this->assert_true(strpos($book->table()->last_sql,'name') !== false); + $this->assert_true(strpos($book->table()->last_sql,'special') !== false); $this->assert_equals(null,$book->dirty_attributes()); } test/ActiveRecordWriteTest.php @@ -7,45 +7,45 @@ class ExpressionsTest extends SnakeCase_PHPUnit_Framework_TestCase { public function test_values() { - $c = new Expressions('a=? and b=?',1,2); + $c = new Expressions(null,'a=? and b=?',1,2); $this->assert_equals(array(1,2), $c->values()); } public function test_one_variable() { - $c = new Expressions('name=?','Tito'); + $c = new Expressions(null,'name=?','Tito'); $this->assert_equals('name=?',$c->to_s()); $this->assert_equals(array('Tito'),$c->values()); } public function test_array_variable() { - $c = new Expressions('name IN(?) and id=?',array('Tito','George'),1); + $c = new Expressions(null,'name IN(?) and id=?',array('Tito','George'),1); $this->assert_equals(array(array('Tito','George'),1),$c->values()); } public function test_multiple_variables() { - $c = new Expressions('name=? and book=?','Tito','Sharks'); + $c = new Expressions(null,'name=? and book=?','Tito','Sharks'); $this->assert_equals('name=? and book=?',$c->to_s()); $this->assert_equals(array('Tito','Sharks'),$c->values()); } public function test_to_string() { - $c = new Expressions('name=? and book=?','Tito','Sharks'); + $c = new Expressions(null,'name=? and book=?','Tito','Sharks'); $this->assert_equals('name=? and book=?',$c->to_s()); } public function test_to_string_with_array_variable() { - $c = new Expressions('name IN(?) and id=?',array('Tito','George'),1); + $c = new Expressions(null,'name IN(?) and id=?',array('Tito','George'),1); $this->assert_equals('name IN(?,?) and id=?',$c->to_s()); } public function test_to_string_with_null_options() { - $c = new Expressions('name=? and book=?','Tito','Sharks'); + $c = new Expressions(null,'name=? and book=?','Tito','Sharks'); $x = null; $this->assert_equals('name=? and book=?',$c->to_s(false,$x)); } @@ -55,83 +55,83 @@ class ExpressionsTest extends SnakeCase_PHPUnit_Framework_TestCase */ public function test_insufficient_variables() { - $c = new Expressions('name=? and id=?','Tito'); + $c = new Expressions(null,'name=? and id=?','Tito'); $c->to_s(); } public function test_no_values() { - $c = new Expressions("name='Tito'"); + $c = new Expressions(null,"name='Tito'"); $this->assert_equals("name='Tito'",$c->to_s()); $this->assert_equals(0,count($c->values())); } public function test_null_variable() { - $a = new Expressions('name=?',null); + $a = new Expressions(null,'name=?',null); $this->assert_equals('name=?',$a->to_s()); $this->assert_equals(array(null),$a->values()); } public function test_zero_variable() { - $a = new Expressions('name=?',0); + $a = new Expressions(null,'name=?',0); $this->assert_equals('name=?',$a->to_s()); $this->assert_equals(array(0),$a->values()); } public function test_ignore_invalid_parameter_marker() { - $a = new Expressions("question='Do you love backslashes?' and id in(?)",array(1,2)); + $a = new Expressions(null,"question='Do you love backslashes?' and id in(?)",array(1,2)); $this->assert_equals("question='Do you love backslashes?' and id in(?,?)",$a->to_s()); } public function test_ignore_parameter_marker_with_escaped_quote() { - $a = new Expressions("question='Do you love''s backslashes?' and id in(?)",array(1,2)); + $a = new Expressions(null,"question='Do you love''s backslashes?' and id in(?)",array(1,2)); $this->assert_equals("question='Do you love''s backslashes?' and id in(?,?)",$a->to_s()); } public function test_ignore_parameter_marker_with_backspace_escaped_quote() { - $a = new Expressions("question='Do you love\\'s backslashes?' and id in(?)",array(1,2)); + $a = new Expressions(null,"question='Do you love\\'s backslashes?' and id in(?)",array(1,2)); $this->assert_equals("question='Do you love\\'s backslashes?' and id in(?,?)",$a->to_s()); } public function test_substitute() { - $a = new Expressions('name=? and id=?','Tito',1); + $a = new Expressions(null,'name=? and id=?','Tito',1); $this->assert_equals("name='Tito' and id=1",$a->to_s(true)); } public function test_substitute_quotes_scalars_but_not_others() { - $a = new Expressions('id in(?)',array(1,'2',3.5)); + $a = new Expressions(null,'id in(?)',array(1,'2',3.5)); $this->assert_equals("id in(1,'2',3.5)",$a->to_s(true)); } public function test_substitute_where_value_has_question_mark() { - $a = new Expressions('name=? and id=?','??????',1); + $a = new Expressions(null,'name=? and id=?','??????',1); $this->assert_equals("name='??????' and id=1",$a->to_s(true)); } public function test_substitute_array_value() { - $a = new Expressions('id in(?)',array(1,2)); + $a = new Expressions(null,'id in(?)',array(1,2)); $this->assert_equals("id in(1,2)",$a->to_s(true)); } public function test_substitute_escapes_quotes() { - $a = new Expressions('name=? or name in(?)',"Tito's Guild",array(1,"Tito's Guild")); + $a = new Expressions(null,'name=? or name in(?)',"Tito's Guild",array(1,"Tito's Guild")); $this->assert_equals("name='Tito''s Guild' or name in(1,'Tito''s Guild')",$a->to_s(true)); } public function test_substitute_escape_quotes_with_connections_escape_method() { $conn = ActiveRecord\ConnectionManager::get_connection(); - $a = new Expressions('name=?',"Tito's Guild"); + $a = new Expressions(null,'name=?',"Tito's Guild"); $a->set_connection($conn); $escaped = $conn->escape("Tito's Guild"); $this->assert_equals("name='$escaped'",$a->to_s(true)); @@ -139,14 +139,14 @@ class ExpressionsTest extends SnakeCase_PHPUnit_Framework_TestCase public function test_bind() { - $a = new Expressions('name=? and id=?','Tito'); + $a = new Expressions(null,'name=? and id=?','Tito'); $a->bind(2,1); $this->assert_equals(array('Tito',1),$a->values()); } public function test_bind_overwrite_existing() { - $a = new Expressions('name=? and id=?','Tito',1); + $a = new Expressions(null,'name=? and id=?','Tito',1); $a->bind(2,99); $this->assert_equals(array('Tito',99),$a->values()); } @@ -156,13 +156,13 @@ class ExpressionsTest extends SnakeCase_PHPUnit_Framework_TestCase */ public function test_bind_invalid_parameter_number() { - $a = new Expressions('name=?'); + $a = new Expressions(null,'name=?'); $a->bind(0,99); } public function test_subsitute_using_alternate_values() { - $a = new Expressions('name=?','Tito'); + $a = new Expressions(null,'name=?','Tito'); $this->assert_equals("name='Tito'",$a->to_s(true)); $x = array('values' => array('Hocus')); $this->assert_equals("name='Hocus'",$a->to_s(true,$x)); @@ -170,25 +170,25 @@ class ExpressionsTest extends SnakeCase_PHPUnit_Framework_TestCase public function test_null_value() { - $a = new Expressions('name=?',null); + $a = new Expressions(null,'name=?',null); $this->assert_equals('name=NULL',$a->to_s(true)); } public function test_hash_with_default_glue() { - $a = new Expressions(array('id' => 1, 'name' => 'Tito')); + $a = new Expressions(null,array('id' => 1, 'name' => 'Tito')); $this->assert_equals('id=? AND name=?',$a->to_s()); } public function test_hash_with_glue() { - $a = new Expressions(array('id' => 1, 'name' => 'Tito'),', '); + $a = new Expressions(null,array('id' => 1, 'name' => 'Tito'),', '); $this->assert_equals('id=?, name=?',$a->to_s()); } public function test_hash_with_array() { - $a = new Expressions(array('id' => 1, 'name' => array('Tito','Mexican'))); + $a = new Expressions(null,array('id' => 1, 'name' => array('Tito','Mexican'))); $this->assert_equals('id=? AND name IN(?,?)',$a->to_s()); } } test/ExpressionsTest.php @@ -26,22 +26,22 @@ class SQLBuilderTest extends DatabaseTest public function test_where_with_array() { - $this->sql->where('id=? AND name IN(?)',1,array('Tito','Mexican')); - $this->assert_equals('SELECT * FROM authors WHERE id=? AND name IN(?,?)',(string)$this->sql); + $this->sql->where('`id`=? AND `name` IN(?)',1,array('Tito','Mexican')); + $this->assert_equals('SELECT * FROM authors WHERE `id`=? AND `name` IN(?,?)',(string)$this->sql); $this->assert_equals(array(1,'Tito','Mexican'),$this->sql->get_where_values()); } public function test_where_with_hash() { $this->sql->where(array('id' => 1, 'name' => 'Tito')); - $this->assert_equals('SELECT * FROM authors WHERE id=? AND name=?',(string)$this->sql); + $this->assert_equals('SELECT * FROM authors WHERE `id`=? AND `name`=?',(string)$this->sql); $this->assert_equals(array(1,'Tito'),$this->sql->get_where_values()); } public function test_where_with_hash_and_array() { $this->sql->where(array('id' => 1, 'name' => array('Tito','Mexican'))); - $this->assert_equals('SELECT * FROM authors WHERE id=? AND name IN(?,?)',(string)$this->sql); + $this->assert_equals('SELECT * FROM authors WHERE `id`=? AND `name` IN(?,?)',(string)$this->sql); $this->assert_equals(array(1,'Tito','Mexican'),$this->sql->get_where_values()); } @@ -101,7 +101,7 @@ class SQLBuilderTest extends DatabaseTest $this->sql->order('name'); $this->sql->group('name'); $this->sql->where(array('id' => 1)); - $this->assert_equals("SELECT * FROM authors WHERE id=? GROUP BY name HAVING created_at > '2009-01-01' ORDER BY name LIMIT 1,10", (string)$this->sql); + $this->assert_equals("SELECT * FROM authors WHERE `id`=? GROUP BY name HAVING created_at > '2009-01-01' ORDER BY name LIMIT 1,10", (string)$this->sql); } /** @@ -123,26 +123,26 @@ class SQLBuilderTest extends DatabaseTest public function test_insert() { $this->sql->insert(array('id' => 1, 'name' => 'Tito')); - $this->assert_equals('INSERT INTO authors(id,name) VALUES(?,?)',(string)$this->sql); + $this->assert_equals('INSERT INTO authors(`id`,`name`) VALUES(?,?)',(string)$this->sql); } public function test_insert_with_null() { $this->sql->insert(array('id' => 1, 'name' => null)); - $this->assert_equals('INSERT INTO authors(id,name) VALUES(?,?)',$this->sql->to_s()); + $this->assert_equals('INSERT INTO authors(`id`,`name`) VALUES(?,?)',$this->sql->to_s()); } public function test_update() { $this->sql->update(array('id' => 1, 'name' => 'Tito'))->where('id=1 AND name IN(?)',array('Tito','Mexican')); - $this->assert_equals('UPDATE authors SET id=?, name=? WHERE id=1 AND name IN(?,?)',(string)$this->sql); + $this->assert_equals('UPDATE authors SET `id`=?, `name`=? WHERE id=1 AND name IN(?,?)',(string)$this->sql); $this->assert_equals(array(1,'Tito','Tito','Mexican'),$this->sql->bind_values()); } public function test_update_with_null() { $this->sql->update(array('id' => 1, 'name' => null))->where('id=1'); - $this->assert_equals('UPDATE authors SET id=?, name=? WHERE id=1',$this->sql->to_s()); + $this->assert_equals('UPDATE authors SET `id`=?, `name`=? WHERE id=1',$this->sql->to_s()); } public function test_delete() @@ -161,7 +161,7 @@ class SQLBuilderTest extends DatabaseTest public function test_delete_with_hash() { $this->sql->delete(array('id' => 1, 'name' => array('Tito','Mexican'))); - $this->assert_equals('DELETE FROM authors WHERE id=? AND name IN(?,?)',$this->sql->to_s()); + $this->assert_equals('DELETE FROM authors WHERE `id`=? AND `name` IN(?,?)',$this->sql->to_s()); $this->assert_equals(array(1,'Tito','Mexican'),$this->sql->get_where_values()); } test/SQLBuilderTest.php b72094c767631ce678481b25c298ae8c5ba6e01e kla la.kien@gmail.com http://github.com/kla/php-activerecord/commit/7fb6a5433740a4fbd758ce5ab0abaa5d9c078914 7fb6a5433740a4fbd758ce5ab0abaa5d9c078914 2009-09-18T14:50:02-07:00 2009-09-18T14:50:02-07:00 quote field names when possible f056475bfd7b580c7bf0ffa5332b26692575d39a kla la.kien@gmail.com