From 07886a84821909a48dd40819a9584aa7f483dfe0 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 25 Sep 2010 01:41:26 +0000
Subject: [PATCH] - Patch #921582 by munzirtaha: is_null() should be replaced
by !isset because it's faster.
---
includes/database/mysql/schema.inc | 4 ++--
includes/database/pgsql/schema.inc | 2 +-
includes/database/select.inc | 4 ++--
includes/database/sqlite/database.inc | 2 +-
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 1712ca2a459c..cba41eb5f7c0 100644
--- a/includes/database/mysql/schema.inc
+++ b/includes/database/mysql/schema.inc
@@ -156,7 +156,7 @@ protected function createFieldSql($name, $spec) {
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 @@ public function fieldSetDefault($table, $field, $default) {
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 4c9ce4638c76..cfdb312775a3 100644
--- a/includes/database/pgsql/schema.inc
+++ b/includes/database/pgsql/schema.inc
@@ -353,7 +353,7 @@ public function fieldSetDefault($table, $field, $default) {
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 72d3454b640a..fd4bd7f87ce7 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -682,7 +682,7 @@ public function isPrepared() {
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 @@ public function isPrepared() {
*/
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 4b7aaa6206f8..476876d3ef4e 100644
--- a/includes/database/sqlite/database.inc
+++ b/includes/database/sqlite/database.inc
@@ -82,7 +82,7 @@ public function sqlFunctionIf($condition, $expr1, $expr2 = NULL) {
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 c79da0328993..ec2b57a2c05b 100644
--- a/includes/database/sqlite/query.inc
+++ b/includes/database/sqlite/query.inc
@@ -110,7 +110,7 @@ public function execute() {
$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);
}
--
GitLab