recess/test/AllTests.php recess/test/bootstrap.php recess/test/recess/RecessAllTests.php recess/test/recess/database/PdoDsnSettings.php recess/test/recess/database/RecessDatabaseAllTests.php recess/test/recess/database/orm/ModelTest.php recess/test/recess/database/orm/ModelTestMysql.php recess/test/recess/database/orm/ModelTestSqlite.php recess/test/recess/database/orm/RecessDatabaseOrmAllTests.php recess/test/recess/database/orm/sample-data.xml recess/test/recess/database/pdo/PdoDataSetTest.php recess/test/recess/database/pdo/PdoDataSetTestMysql.php recess/test/recess/database/pdo/PdoDataSetTestSqlite.php recess/test/recess/database/pdo/RecessDatabasePdoAllTests.php recess/test/recess/database/pdo/SqlitePdoDataSourceProviderTest.php recess/test/recess/database/pdo/sample-data.xml recess/test/recess/database/sql/RecessDatabaseSqlAllTests.php recess/test/recess/database/sql/SelectSqlBuilderTest.php recess/test/recess/database/sql/SqlBuilderTest.php recess/test/recess/framework/RecessFrameworkAllTests.php recess/test/recess/framework/routing/RecessFrameworkRoutingAllTests.php recess/test/recess/framework/routing/RtNodeTest.php recess/test/recess/lang/InflectorTest.php recess/test/recess/lang/RecessLangAllTests.php recess/test/recess/lang/RecessObjectTest.php recess/test/recess/lang/RecessReflectionClassTest.php @@ -1,6 +1,7 @@ *.cache *.settings .project +.buildpath *.db recess/temp/compiled/* recess/temp/*.* .gitignore @@ -538,7 +538,12 @@ class ModelDescriptor extends RecessObjectDescriptor { function setTable($table, $loadColumns = true) { $this->table = $table; if($loadColumns) { - $this->columns = $this->getSource()->getColumns($this->table); + $source = $this->getSource(); + if(isset($source)) { + $this->columns = $this->getSource()->getColumns($this->table); + } else { + throw new RecessException('Data Source "' . $this->getSourceName() . '" is not set.', array()); + } } else { $this->columns = array(); } recess/lib/recess/database/orm/Model.class.php @@ -388,17 +388,16 @@ class MysqlDataSourceProvider implements IPdoDataSourceProvider { } } - $statement = $source->prepare($builder->$action()); + $sql = $builder->$action(); + $statement = $source->prepare($sql); $arguments = $builder->getPdoArguments(); foreach($arguments as &$argument) { // Begin workaround for PDO's poor numeric binding $queryParameter = $argument->getQueryParameter(); if(is_numeric($queryParameter)) { continue; } // End Workaround - // Ignore parameters that aren't used in this $action (i.e. assignments in select) if(strpos($sql, $argument->getQueryParameter()) === false) { continue; } - $statement->bindValue($argument->getQueryParameter(), $argument->value); } return $statement; recess/lib/recess/database/pdo/MysqlDataSourceProvider.class.php @@ -90,7 +90,7 @@ class PdoDataSet implements Iterator, Countable, ArrayAccess, ISqlSelectOptions, * Once results are needed this method executes the accumulated query * on the data source. */ - protected function realize() { + protected function realize() { if(!$this->hasResults) { unset($this->results); $this->results = $this->source->queryForClass($this->sqlBuilder, $this->rowClass); @@ -117,7 +117,9 @@ class PdoDataSet implements Iterator, Countable, ArrayAccess, ISqlSelectOptions, return $this->results; } - public function count() { return iterator_count($this); } + public function count() { + return iterator_count($this); + } /* recess/lib/recess/database/pdo/PdoDataSet.class.php @@ -43,7 +43,7 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { public function insert() { $this->insertSanityCheck(); - $sql = 'INSERT INTO ' . $this->table; + $sql = 'INSERT INTO ' . self::escapeWithTicks($this->table); $columns = ''; $values = ''; @@ -52,7 +52,7 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { foreach($this->assignments as $assignment) { if($first) { $first = false; } else { $columns .= ', '; $values .= ', '; } - $columns .= '`' . str_replace($table_prefix, '', $assignment->column) . '`'; + $columns .= self::escapeWithTicks(str_replace($table_prefix, '', $assignment->column)); $values .= $assignment->getQueryParameter(); } $columns = ' (' . $columns . ')'; @@ -129,7 +129,7 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { */ public function delete() { $this->deleteSanityCheck(); - return 'DELETE FROM ' . $this->table . $this->whereHelper(); + return 'DELETE FROM ' . self::escapeWithTicks($this->table) . $this->whereHelper(); } /** @@ -157,14 +157,14 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { */ public function update() { $this->updateSanityCheck(); - $sql = 'UPDATE ' . $this->table . ' SET '; + $sql = 'UPDATE ' . self::escapeWithTicks($this->table) . ' SET '; $first = true; $table_prefix = $this->tableAsPrefix() . '.'; foreach($this->assignments as $assignment) { if($first) { $first = false; } else { $sql .= ', '; } - $sql .= '`' . str_replace($table_prefix, '', $assignment->column) . '` = ' . $assignment->getQueryParameter();; + $sql .= self::escapeWithTicks(str_replace($table_prefix, '', $assignment->column)) . ' = ' . $assignment->getQueryParameter();; } $sql .= $this->whereHelper(); @@ -370,13 +370,13 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { public function select() { $this->selectSanityCheck(); - $sql = 'SELECT ' . $this->distinct . $this->select; + $sql = 'SELECT ' . $this->distinct . self::escapeWithTicks($this->select); foreach($this->selectAs as $selectAs) { $sql .= ', ' . $selectAs; } - $sql .= ' FROM ' . $this->table; + $sql .= ' FROM ' . self::escapeWithTicks($this->table); $sql .= $this->joinHelper(); @@ -551,7 +551,7 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { if(!empty($this->conditions)) { foreach($this->conditions as $clause) { if(!$first) { $sql .= ' AND '; } else { $first = false; } // TODO: Figure out how we'll do ORing - $sql .= $clause->column . ' ' . $clause->operator . ' ' . $clause->getQueryParameter(); + $sql .= self::escapeWithTicks($clause->column) . $clause->operator . $clause->getQueryParameter(); } } @@ -559,7 +559,7 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { $assignments = $this->cleansedAssignmentsAsConditions(); foreach($assignments as $clause) { if(!$first) { $sql .= ' AND '; } else { $first = false; } // TODO: Figure out how we'll do ORing - $sql .= $clause->column . ' = ' . $clause->getQueryParameter(); + $sql .= self::escapeWithTicks($clause->column) . ' = ' . $clause->getQueryParameter(); } } @@ -573,8 +573,8 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { protected function joinHelper() { $sql = ''; if(!empty($this->joins)) { - $this->joins = array_reverse($this->joins, true); - foreach($this->joins as $join) { + $joins = array_reverse($this->joins, true); + foreach($joins as $join) { $joinStatement = ''; if(isset($join->natural)) { @@ -587,8 +587,8 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { $joinStatement .= $join->innerOuterOrCross . ' '; } - $onStatement = ' ON ' . $join->tablePrimaryKey . ' = ' . $join->fromTableForeignKey; - $joinStatement .= 'JOIN ' . $join->table . $onStatement; + $onStatement = ' ON ' . self::escapeWithTicks($join->tablePrimaryKey) . ' = ' . self::escapeWithTicks($join->fromTableForeignKey); + $joinStatement .= 'JOIN ' . self::escapeWithTicks($join->table) . $onStatement; $sql .= $joinStatement; } @@ -596,6 +596,22 @@ class SqlBuilder implements ISqlConditions, ISqlSelectOptions { return $sql; } + protected static function escapeWithTicks($string) { + if($string == '*') { + return $string; + } + if(strpos($string,Library::dotSeparator) !== false) { + $parts = explode('.', $string); + if(isset($parts[1]) && $parts[1] == '*') { + return '`' . $parts[0] . '`.*'; + } else { + return '`' . implode('`.`', $parts) . '`'; + } + } else { + return '`' . $string . '`'; + } + } + protected function orderByHelper() { $sql = ''; if(!empty($this->orderBy)){ @@ -631,17 +647,17 @@ class Criterion { public $value; public $operator; - const GREATER_THAN = '>'; - const GREATER_THAN_EQUAL_TO = '>='; + const GREATER_THAN = ' > '; + const GREATER_THAN_EQUAL_TO = ' >= '; - const LESS_THAN = '<'; - const LESS_THAN_EQUAL_TO = '<='; + const LESS_THAN = ' < '; + const LESS_THAN_EQUAL_TO = ' <= '; const EQUAL_TO = ' = '; - const NOT_EQUAL_TO = '!='; + const NOT_EQUAL_TO = ' != '; - const LIKE = 'LIKE'; - const NOT_LIKE = 'NOT LIKE'; + const LIKE = ' LIKE '; + const NOT_LIKE = ' NOT LIKE '; const COLON = ':'; recess/lib/recess/database/sql/SqlBuilder.class.php TestRunner.php recess/lib/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE recess/lib/simpletest/LICENSE recess/lib/simpletest/README recess/lib/simpletest/VERSION recess/lib/simpletest/authentication.php recess/lib/simpletest/autorun.php recess/lib/simpletest/browser.php recess/lib/simpletest/collector.php recess/lib/simpletest/compatibility.php recess/lib/simpletest/cookies.php recess/lib/simpletest/default_reporter.php recess/lib/simpletest/detached.php recess/lib/simpletest/docs/en/authentication_documentation.html recess/lib/simpletest/docs/en/browser_documentation.html recess/lib/simpletest/docs/en/docs.css recess/lib/simpletest/docs/en/expectation_documentation.html recess/lib/simpletest/docs/en/form_testing_documentation.html recess/lib/simpletest/docs/en/group_test_documentation.html recess/lib/simpletest/docs/en/index.html recess/lib/simpletest/docs/en/mock_objects_documentation.html recess/lib/simpletest/docs/en/overview.html recess/lib/simpletest/docs/en/partial_mocks_documentation.html recess/lib/simpletest/docs/en/reporter_documentation.html recess/lib/simpletest/docs/en/unit_test_documentation.html recess/lib/simpletest/docs/en/web_tester_documentation.html recess/lib/simpletest/docs/fr/authentication_documentation.html recess/lib/simpletest/docs/fr/browser_documentation.html recess/lib/simpletest/docs/fr/docs.css recess/lib/simpletest/docs/fr/expectation_documentation.html recess/lib/simpletest/docs/fr/form_testing_documentation.html recess/lib/simpletest/docs/fr/group_test_documentation.html recess/lib/simpletest/docs/fr/index.html recess/lib/simpletest/docs/fr/mock_objects_documentation.html recess/lib/simpletest/docs/fr/overview.html recess/lib/simpletest/docs/fr/partial_mocks_documentation.html recess/lib/simpletest/docs/fr/reporter_documentation.html recess/lib/simpletest/docs/fr/server_stubs_documentation.html recess/lib/simpletest/docs/fr/unit_test_documentation.html recess/lib/simpletest/docs/fr/web_tester_documentation.html recess/lib/simpletest/dumper.php recess/lib/simpletest/eclipse.php recess/lib/simpletest/encoding.php recess/lib/simpletest/errors.php recess/lib/simpletest/exceptions.php recess/lib/simpletest/expectation.php recess/lib/simpletest/extensions/pear_test_case.php recess/lib/simpletest/extensions/phpunit_test_case.php recess/lib/simpletest/extensions/testdox.php recess/lib/simpletest/extensions/testdox/test.php recess/lib/simpletest/form.php recess/lib/simpletest/frames.php recess/lib/simpletest/http.php recess/lib/simpletest/invoker.php recess/lib/simpletest/mock_objects.php recess/lib/simpletest/page.php recess/lib/simpletest/parser.php recess/lib/simpletest/reflection_php4.php recess/lib/simpletest/reflection_php5.php recess/lib/simpletest/remote.php recess/lib/simpletest/reporter.php recess/lib/simpletest/scorer.php recess/lib/simpletest/selector.php recess/lib/simpletest/shell_tester.php recess/lib/simpletest/simpletest.php recess/lib/simpletest/socket.php recess/lib/simpletest/tag.php recess/lib/simpletest/test/acceptance_test.php recess/lib/simpletest/test/adapter_test.php recess/lib/simpletest/test/all_tests.php recess/lib/simpletest/test/authentication_test.php recess/lib/simpletest/test/autorun_test.php recess/lib/simpletest/test/bad_test_suite.php recess/lib/simpletest/test/browser_test.php recess/lib/simpletest/test/collector_test.php recess/lib/simpletest/test/command_line_test.php recess/lib/simpletest/test/compatibility_test.php recess/lib/simpletest/test/cookies_test.php recess/lib/simpletest/test/detached_test.php recess/lib/simpletest/test/dumper_test.php recess/lib/simpletest/test/eclipse_test.php recess/lib/simpletest/test/encoding_test.php recess/lib/simpletest/test/errors_test.php recess/lib/simpletest/test/exceptions_test.php recess/lib/simpletest/test/expectation_test.php recess/lib/simpletest/test/form_test.php recess/lib/simpletest/test/frames_test.php recess/lib/simpletest/test/http_test.php recess/lib/simpletest/test/interfaces_test.php recess/lib/simpletest/test/live_test.php recess/lib/simpletest/test/mock_objects_test.php recess/lib/simpletest/test/page_test.php recess/lib/simpletest/test/parse_error_test.php recess/lib/simpletest/test/parser_test.php recess/lib/simpletest/test/reflection_php4_test.php recess/lib/simpletest/test/reflection_php5_test.php recess/lib/simpletest/test/remote_test.php recess/lib/simpletest/test/shell_test.php recess/lib/simpletest/test/shell_tester_test.php recess/lib/simpletest/test/simpletest_test.php recess/lib/simpletest/test/socket_test.php recess/lib/simpletest/test/support/collector/collectable.1 recess/lib/simpletest/test/support/collector/collectable.2 recess/lib/simpletest/test/support/empty_test_file.php recess/lib/simpletest/test/support/latin1_sample recess/lib/simpletest/test/support/spl_examples.php recess/lib/simpletest/test/support/supplementary_upload_sample.txt recess/lib/simpletest/test/support/test1.php recess/lib/simpletest/test/support/upload_sample.txt recess/lib/simpletest/test/tag_test.php recess/lib/simpletest/test/test_with_parse_error.php recess/lib/simpletest/test/unit_tester_test.php recess/lib/simpletest/test/unit_tests.php recess/lib/simpletest/test/url_test.php recess/lib/simpletest/test/user_agent_test.php recess/lib/simpletest/test/visual_test.php recess/lib/simpletest/test/web_tester_test.php recess/lib/simpletest/test/xml_test.php recess/lib/simpletest/test_case.php recess/lib/simpletest/unit_tester.php recess/lib/simpletest/url.php recess/lib/simpletest/user_agent.php recess/lib/simpletest/web_tester.php recess/lib/simpletest/xml.php recess/test/lib/recess/database/orm/ModelTest.class.php recess/test/lib/recess/database/pdo/MutableSelectResultsTest.class.php recess/test/lib/recess/database/pdo/MutableSelectSetTest.class.php recess/test/lib/recess/database/pdo/PdoDataSetTest.class.php recess/test/lib/recess/database/pdo/SqlitePdoDataSourceTest.class.php recess/test/lib/recess/database/sql/SelectSqlBuilderTest.class.php recess/test/lib/recess/database/sql/SqlBuilderTest.class.php recess/test/lib/recess/framework/routing/RtNodeTest.class.php recess/test/lib/recess/lang/InflectorTest.class.php recess/test/lib/recess/lang/RecessObjectTest.class.php recess/test/lib/recess/lang/RecessReflectionClassTest.class.php ee292b293a44d73ca68efce8ed86e5f5a4a6f90d KrisJordan krisjordan@gmail.com http://github.com/recess/recess/commit/0732afaedb8a178a8d3265e7258560ea9a0eecfa 0732afaedb8a178a8d3265e7258560ea9a0eecfa 2009-02-17T01:37:22-08:00 2009-02-17T01:37:22-08:00 Moved from simpletest to PHPUnit d3b679161ea5f5f0ec81785acbf492f483cfae78 KrisJordan krisjordan@gmail.com