summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/database/database.inc8
-rw-r--r--includes/database/mysql/schema.inc12
-rw-r--r--includes/database/pgsql/schema.inc12
-rw-r--r--includes/database/schema.inc2
-rw-r--r--includes/database/sqlite/schema.inc14
-rw-r--r--modules/simpletest/tests/database_test.test8
-rw-r--r--modules/simpletest/tests/schema.test2
-rw-r--r--modules/system/system.install4
-rw-r--r--modules/user/user.install8
9 files changed, 35 insertions, 35 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 240c3c659e6..6b089462005 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -2571,14 +2571,14 @@ function db_table_exists($table) {
*
* @param $table
* The name of the table in drupal (no prefixing).
- * @param $name
- * The name of the column.
+ * @param $field
+ * The name of the field.
*
* @return
* TRUE if the given column exists, otherwise FALSE.
*/
-function db_column_exists($table, $column) {
- return Database::getConnection()->schema()->columnExists($table, $column);
+function db_field_exists($table, $field) {
+ return Database::getConnection()->schema()->fieldExists($table, $field);
}
/**
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc
index 2b9ca71cab9..9af75fd50ea 100644
--- a/includes/database/mysql/schema.inc
+++ b/includes/database/mysql/schema.inc
@@ -289,7 +289,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
if (!$this->tableExists($table)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot add field %table.%field: table doesn't exist.", array('%field' => $field, '%table' => $table)));
}
- if ($this->columnExists($table, $field)) {
+ if ($this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectExistsException(t("Cannot add field %table.%field: field already exists.", array('%field' => $field, '%table' => $table)));
}
@@ -316,7 +316,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
}
public function dropField($table, $field) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
return FALSE;
}
@@ -325,7 +325,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
}
public function fieldSetDefault($table, $field, $default) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot set default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field)));
}
@@ -340,7 +340,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
}
public function fieldSetNoDefault($table, $field) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot remove default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field)));
}
@@ -415,10 +415,10 @@ class DatabaseSchema_mysql extends DatabaseSchema {
}
public function changeField($table, $field, $field_new, $spec, $keys_new = array()) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot change the definition of field %table.%name: field doesn't exist.", array('%table' => $table, '%name' => $field)));
}
- if (($field != $field_new) && $this->columnExists($table, $field_new)) {
+ if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
throw new DatabaseSchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new)));
}
diff --git a/includes/database/pgsql/schema.inc b/includes/database/pgsql/schema.inc
index 1306bbd3aa2..fcff331fb53 100644
--- a/includes/database/pgsql/schema.inc
+++ b/includes/database/pgsql/schema.inc
@@ -313,7 +313,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
if (!$this->tableExists($table)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot add field %table.%field: table doesn't exist.", array('%field' => $field, '%table' => $table)));
}
- if ($this->columnExists($table, $field)) {
+ if ($this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectExistsException(t("Cannot add field %table.%field: field already exists.", array('%field' => $field, '%table' => $table)));
}
@@ -343,7 +343,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
}
public function dropField($table, $field) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
return FALSE;
}
@@ -352,7 +352,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
}
public function fieldSetDefault($table, $field, $default) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot set default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field)));
}
@@ -367,7 +367,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
}
public function fieldSetNoDefault($table, $field) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot remove default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field)));
}
@@ -457,10 +457,10 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
}
public function changeField($table, $field, $field_new, $spec, $new_keys = array()) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot change the definition of field %table.%name: field doesn't exist.", array('%table' => $table, '%name' => $field)));
}
- if (($field != $field_new) && $this->columnExists($table, $field_new)) {
+ if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
throw new DatabaseSchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new)));
}
diff --git a/includes/database/schema.inc b/includes/database/schema.inc
index 096124532cf..ab2a95a0309 100644
--- a/includes/database/schema.inc
+++ b/includes/database/schema.inc
@@ -252,7 +252,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface {
* @return
* TRUE if the given column exists, otherwise FALSE.
*/
- public function columnExists($table, $column) {
+ public function fieldExists($table, $column) {
$condition = $this->buildTableNameCondition($this->connection->prefixTables('{' . $table . '}'));
$condition->condition('column_name', $column);
$condition->compile($this->connection, $this);
diff --git a/includes/database/sqlite/schema.inc b/includes/database/sqlite/schema.inc
index aa0e203f188..894d51c632e 100644
--- a/includes/database/sqlite/schema.inc
+++ b/includes/database/sqlite/schema.inc
@@ -19,7 +19,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
return (bool) $this->connection->query("SELECT name FROM sqlite_master WHERE type = 'table' AND name LIKE '{" . $table . "}'", array(), array())->fetchField();
}
- public function columnExists($table, $column) {
+ public function fieldExists($table, $column) {
$schema = $this->introspectSchema($table);
return !empty($schema['fields'][$column]);
}
@@ -262,7 +262,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
if (!$this->tableExists($table)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot add field %table.%field: table doesn't exist.", array('%field' => $field, '%table' => $table)));
}
- if ($this->columnExists($table, $field)) {
+ if ($this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectExistsException(t("Cannot add field %table.%field: field already exists.", array('%field' => $field, '%table' => $table)));
}
@@ -377,7 +377,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
}
public function dropField($table, $field) {
- if ($this->columnExists($table, $field)) {
+ if ($this->fieldExists($table, $field)) {
return FALSE;
}
@@ -399,10 +399,10 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
}
public function changeField($table, $field, $field_new, $spec, $keys_new = array()) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot change the definition of field %table.%name: field doesn't exist.", array('%table' => $table, '%name' => $field)));
}
- if (($field != $field_new) && $this->columnExists($table, $field_new)) {
+ if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
throw new DatabaseSchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new)));
}
@@ -499,7 +499,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
}
public function fieldSetDefault($table, $field, $default) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot set default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field)));
}
@@ -509,7 +509,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
}
public function fieldSetNoDefault($table, $field) {
- if (!$this->columnExists($table, $field)) {
+ if (!$this->fieldExists($table, $field)) {
throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot remove default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field)));
}
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index d8b9d87d996..95ebc1ca5db 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 0ddead4dc9a..53e8ea72392 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 bdef35d5c3f..48db779e992 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 483d227ac78..69f80af6aa1 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);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-31 16:42:46 +0000