diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/simpletest/tests/database_test.test | 8 | ||||
| -rw-r--r-- | modules/simpletest/tests/schema.test | 2 | ||||
| -rw-r--r-- | modules/system/system.install | 4 | ||||
| -rw-r--r-- | modules/user/user.install | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index d8b9d87d9..95ebc1ca5 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -2434,11 +2434,11 @@ class DatabaseRegressionTestCase extends DatabaseTestCase { } /** - * Test the db_column_exists() function. + * Test the db_field_exists() function. */ - function testDBColumnExists() { - $this->assertIdentical(TRUE, db_column_exists('node', 'nid'), t('Returns true for existent column.')); - $this->assertIdentical(FALSE, db_column_exists('node', 'nosuchcolumn'), t('Returns false for nonexistent column.')); + function testDBFieldExists() { + $this->assertIdentical(TRUE, db_field_exists('node', 'nid'), t('Returns true for existent column.')); + $this->assertIdentical(FALSE, db_field_exists('node', 'nosuchcolumn'), t('Returns false for nonexistent column.')); } /** diff --git a/modules/simpletest/tests/schema.test b/modules/simpletest/tests/schema.test index 0ddead4dc..53e8ea723 100644 --- a/modules/simpletest/tests/schema.test +++ b/modules/simpletest/tests/schema.test @@ -170,7 +170,7 @@ class SchemaTestCase extends DrupalWebTestCase { // Finally, check each column and try to insert invalid values into them. foreach($table_spec['fields'] as $column_name => $column_spec) { - $this->assertTrue(db_column_exists($table_name, $column_name), t('Unsigned @type column was created.', array('@type' => $column_spec['type']))); + $this->assertTrue(db_field_exists($table_name, $column_name), t('Unsigned @type column was created.', array('@type' => $column_spec['type']))); $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), t('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type']))); } } diff --git a/modules/system/system.install b/modules/system/system.install index bdef35d5c..48db779e9 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1549,7 +1549,7 @@ function system_update_6050() { */ function system_update_6051() { - if (!db_column_exists('users', 'signature_format')) { + if (!db_field_exists('users', 'signature_format')) { // Set future text formats to FILTER_FORMAT_DEFAULT to ensure a safe default // when incompatible modules insert into the users table. An actual format @@ -2230,7 +2230,7 @@ function system_update_7036() { } $insert->execute(); - // Remove obsolete variable 'site_offline_message'. See + // Remove obsolete variable 'site_offline_message'. See // update_fix_d7_requirements(). variable_del('site_offline_message'); } diff --git a/modules/user/user.install b/modules/user/user.install index 483d227ac..69f80af6a 100644 --- a/modules/user/user.install +++ b/modules/user/user.install @@ -390,8 +390,8 @@ function user_update_7002(&$sandbox) { $timezones = system_time_zones(); // Update this many per page load. $count = 10000; - $contributed_date_module = db_column_exists('users', 'timezone_name'); - $contributed_event_module = db_column_exists('users', 'timezone_id'); + $contributed_date_module = db_field_exists('users', 'timezone_name'); + $contributed_event_module = db_field_exists('users', 'timezone_id'); $results = db_query_range("SELECT uid FROM {users} ORDER BY uid", $sandbox['user_from'], $count); foreach ($results as $account) { @@ -487,7 +487,7 @@ function user_update_7004(&$sandbox) { if (!isset($sandbox['progress'])) { // Check that the field hasn't been updated in an aborted run of this // update. - if (!db_column_exists('users', 'picture_fid')) { + if (!db_field_exists('users', 'picture_fid')) { // Add a new field for the fid. db_add_field('users', 'picture_fid', $picture_field); } @@ -566,7 +566,7 @@ function user_update_7006(&$sandbox) { ); // Check that the field hasn't been updated in an aborted run of this // update. - if (!db_column_exists('role_permission', 'module')) { + if (!db_field_exists('role_permission', 'module')) { // Add a new field for the fid. db_add_field('role_permission', 'module', $module_field); } |