From 634379299f7ab35bf64504718a77d00767fa2dfa Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 4 Jan 2009 19:56:51 +0000 Subject: - Patch #320591 by Moshe, Crell et al: tag specific alter hook for database queries. --- modules/simpletest/tests/database_test.module | 14 +++++++++----- modules/simpletest/tests/database_test.test | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'modules/simpletest/tests') diff --git a/modules/simpletest/tests/database_test.module b/modules/simpletest/tests/database_test.module index 555f976b3..25631e0c7 100644 --- a/modules/simpletest/tests/database_test.module +++ b/modules/simpletest/tests/database_test.module @@ -4,16 +4,12 @@ /** * Implementation of hook_query_alter(). */ -function database_test_query_alter(SelectQuery $query) { +function database_test_query_alter(QueryAlterableInterface $query) { if ($query->hasTag('database_test_alter_add_range')) { $query->range(0, 2); } - if ($query->hasTag('database_test_alter_remove_range')) { - $query->range(); - } - if ($query->hasTag('database_test_alter_add_join')) { $people_alias = $query->join('test', 'people', "test_task.pid=people.id"); $name_field = $query->addField('people', 'name', 'name'); @@ -36,6 +32,14 @@ function database_test_query_alter(SelectQuery $query) { } } + +/** + * Implementation of hook_query_TAG_alter(). Called by DatabaseTestCase::testAlterRemoveRange. + */ +function database_test_query_database_test_alter_remove_range_alter(QueryAlterableInterface $query) { + $query->range(); +} + /** * Implementation of hook_menu(). */ diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index 37c6fac5f..9cbec229a 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -1695,7 +1695,7 @@ class DatabaseAlter2TestCase extends DatabaseTestCase { } /** - * Test that we can remove a range() value from a query. + * Test that we can remove a range() value from a query. This also tests hook_query_TAG_alter(). */ function testAlterRemoveRange() { $query = db_select('test'); -- cgit v1.2.3