diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-09-25 01:41:26 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-09-25 01:41:26 +0000 |
commit | 07886a84821909a48dd40819a9584aa7f483dfe0 (patch) | |
tree | fa0821505f17db88761f6279df68d7dace604ce2 | |
parent | e22b2153a2a83b1d1eca60c62703514cd09a55aa (diff) | |
download | brdo-07886a84821909a48dd40819a9584aa7f483dfe0.tar.gz brdo-07886a84821909a48dd40819a9584aa7f483dfe0.tar.bz2 |
- Patch #921582 by munzirtaha: is_null() should be replaced by !isset because it's faster.
-rw-r--r-- | includes/database/mysql/schema.inc | 4 | ||||
-rw-r--r-- | includes/database/pgsql/schema.inc | 2 | ||||
-rw-r--r-- | includes/database/select.inc | 4 | ||||
-rw-r--r-- | includes/database/sqlite/database.inc | 2 | ||||
-rw-r--r-- | includes/database/sqlite/query.inc | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc index 1712ca2a4..cba41eb5f 100644 --- a/includes/database/mysql/schema.inc +++ b/includes/database/mysql/schema.inc @@ -156,7 +156,7 @@ class DatabaseSchema_mysql extends DatabaseSchema { if (is_string($spec['default'])) { $spec['default'] = "'" . $spec['default'] . "'"; } - elseif (is_null($spec['default'])) { + elseif (!isset($spec['default'])) { $spec['default'] = 'NULL'; } $sql .= ' DEFAULT ' . $spec['default']; @@ -351,7 +351,7 @@ class DatabaseSchema_mysql extends DatabaseSchema { throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot set default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field))); } - if (is_null($default)) { + if (!isset($default)) { $default = 'NULL'; } else { diff --git a/includes/database/pgsql/schema.inc b/includes/database/pgsql/schema.inc index 4c9ce4638..cfdb31277 100644 --- a/includes/database/pgsql/schema.inc +++ b/includes/database/pgsql/schema.inc @@ -353,7 +353,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema { throw new DatabaseSchemaObjectDoesNotExistException(t("Cannot set default value of field %table.%field: field doesn't exist.", array('%table' => $table, '%field' => $field))); } - if (is_null($default)) { + if (!isset($default)) { $default = 'NULL'; } else { diff --git a/includes/database/select.inc b/includes/database/select.inc index 72d3454b6..fd4bd7f87 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -682,7 +682,7 @@ class SelectQueryExtender implements SelectQueryInterface { public function preExecute(SelectQueryInterface $query = NULL) { // If no query object is passed in, use $this. - if (is_null($query)) { + if (!isset($query)) { $query = $this; } @@ -1147,7 +1147,7 @@ class SelectQuery extends Query implements SelectQueryInterface { */ public function preExecute(SelectQueryInterface $query = NULL) { // If no query object is passed in, use $this. - if (is_null($query)) { + if (!isset($query)) { $query = $this; } diff --git a/includes/database/sqlite/database.inc b/includes/database/sqlite/database.inc index 4b7aaa620..476876d3e 100644 --- a/includes/database/sqlite/database.inc +++ b/includes/database/sqlite/database.inc @@ -82,7 +82,7 @@ class DatabaseConnection_sqlite extends DatabaseConnection { public function sqlFunctionGreatest() { $args = func_get_args(); foreach ($args as $k => $v) { - if (is_null($v)) { + if (!isset($v)) { unset($args); } } diff --git a/includes/database/sqlite/query.inc b/includes/database/sqlite/query.inc index c79da0328..ec2b57a2c 100644 --- a/includes/database/sqlite/query.inc +++ b/includes/database/sqlite/query.inc @@ -110,7 +110,7 @@ class UpdateQuery_sqlite extends UpdateQuery { $condition->condition($field, $data['expression'], '<>'); $condition->isNull($field); } - elseif (is_null($data)) { + elseif (!isset($data)) { // The field will be set to NULL. $condition->isNull($field); } |