diff options
Diffstat (limited to 'includes/database')
| -rw-r--r-- | includes/database/database.inc | 8 | ||||
| -rw-r--r-- | includes/database/mysql/database.inc | 2 | ||||
| -rw-r--r-- | includes/database/query.inc | 2 | ||||
| -rw-r--r-- | includes/database/schema.inc | 8 | ||||
| -rw-r--r-- | includes/database/select.inc | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index 1dc89fd14..d15a02217 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -836,7 +836,7 @@ abstract class DatabaseConnection extends PDO { * Escape characters that work as wildcard characters in a LIKE pattern. * * The wildcard characters "%" and "_" as well as backslash are prefixed with - * a backslash. Use this to do a seach for a verbatim string without any + * a backslash. Use this to do a search for a verbatim string without any * wildcard behavior. * * For example, the following does a case-insensitive query for all rows whose @@ -1259,7 +1259,7 @@ abstract class Database { * A logging function callback array. * * The function must accept the same function signature as Drupal's - * watchdog(). The array containst key/value pairs for callback (string), + * watchdog(). The array contains key/value pairs for callback (string), * default_severity (int), and error_severity (int). * * @var string @@ -1561,7 +1561,7 @@ abstract class Database { * The database connection key. Defaults to NULL which means the active key. */ public static function closeConnection($target = NULL, $key = NULL) { - // Gets the active conection by default. + // Gets the active connection by default. if (!isset($key)) { $key = self::$activeKey; } @@ -2338,7 +2338,7 @@ function db_escape_table($table) { * Escape characters that work as wildcard characters in a LIKE pattern. * * The wildcard characters "%" and "_" as well as backslash are prefixed with - * a backslash. Use this to do a seach for a verbatim string without any + * a backslash. Use this to do a search for a verbatim string without any * wildcard behavior. * * For example, the following does a case-insensitive query for all rows whose diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc index 437d796e3..39ba59e4b 100644 --- a/includes/database/mysql/database.inc +++ b/includes/database/mysql/database.inc @@ -42,7 +42,7 @@ class DatabaseConnection_mysql extends DatabaseConnection { // This allows Drupal to run almost seamlessly on many different // kinds of database systems. These settings force MySQL to behave // the same as postgresql, or sqlite in regards to syntax interpretation - // and invalid data handling. See http://drupal.org/node/344575 for further disscussion. + // and invalid data handling. See http://drupal.org/node/344575 for further discussion. $this->exec("SET sql_mode='ANSI,TRADITIONAL'"); } diff --git a/includes/database/query.inc b/includes/database/query.inc index 0061abe0f..64efe4bff 100644 --- a/includes/database/query.inc +++ b/includes/database/query.inc @@ -528,7 +528,7 @@ class InsertQuery extends Query { // We have to assume that the used aliases match the insert fields. // Regular fields are added to the query before expressions, maintain the // same order for the insert fields. - // This behavior can be overriden by calling fields() manually as only the + // This behavior can be overridden by calling fields() manually as only the // first call to fields() does have an effect. $this->fields(array_merge(array_keys($this->fromQuery->getFields()), array_keys($this->fromQuery->getExpressions()))); } diff --git a/includes/database/schema.inc b/includes/database/schema.inc index af7ed4dbe..670d3ab3b 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -84,7 +84,7 @@ * of the local table, each value is an array with a single key pair as * 'tablename' => 'column' where 'column' is the foreign column to * reference. - * - 'indexes': An associative array of indexes ('indexame' => + * - 'indexes': An associative array of indexes ('indexname' => * specification). Each specification is an array of one or more * key column specifiers (see below) that form an index on the * table. @@ -216,7 +216,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { $condition = $this->buildTableNameCondition($this->connection->prefixTables('{' . $table . '}')); $condition->compile($this->connection, $this); // Normally, we would heartily discourage the use of string - // concatination for conditionals like this however, we + // concatenation for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. // Don't use {} around information_schema.tables table. @@ -236,7 +236,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { $condition = $this->buildTableNameCondition($table_expression, 'LIKE'); $condition->compile($this->connection, $this); // Normally, we would heartily discourage the use of string - // concatination for conditionals like this however, we + // concatenation for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. // Don't use {} around information_schema.tables table. @@ -251,7 +251,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { $condition->condition('column_name', $column); $condition->compile($this->connection, $this); // Normally, we would heartily discourage the use of string - // concatination for conditionals like this however, we + // concatenation for conditionals like this however, we // couldn't use db_select() here because it would prefix // information_schema.tables and the query would fail. // Don't use {} around information_schema.columns table. diff --git a/includes/database/select.inc b/includes/database/select.inc index 210e4b7e5..f3fd8368a 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -541,7 +541,7 @@ class SelectQueryExtender implements SelectQueryInterface { return $this->condition->compile($connection, isset($queryPlaceholder) ? $queryPlaceholder : $this); } - /* Implmeentations of QueryConditionInterface for the HAVING clause. */ + /* Implementations of QueryConditionInterface for the HAVING clause. */ public function havingCondition($field, $value = NULL, $operator = '=') { $this->query->condition($field, $value, $operator, $num_args); @@ -940,7 +940,7 @@ class SelectQuery extends Query implements SelectQueryInterface { return $this->where->compile($connection, isset($queryPlaceholder) ? $queryPlaceholder : $this); } - /* Implmeentations of QueryConditionInterface for the HAVING clause. */ + /* Implementations of QueryConditionInterface for the HAVING clause. */ public function havingCondition($field, $value = NULL, $operator = '=') { if (!isset($num_args)) { |