diff options
| -rw-r--r-- | modules/system/system.install | 10 | ||||
| -rw-r--r-- | modules/user/user.install | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 67ef33777..64b319bc6 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2043,12 +2043,12 @@ function system_update_7016() { $datatype = 'bigint'; break; } - db_query('ALTER TABLE ' . $row->table . ' ALTER COLUMN ' . $row->field . ' TYPE ' . $datatype); - db_query('ALTER TABLE ' . $row->table . ' ADD CHECK (' . $row->field . ' >= 0)'); + db_query('ALTER TABLE ' . $row->table . ' ALTER COLUMN "' . $row->field . '" TYPE ' . $datatype); + db_query('ALTER TABLE ' . $row->table . ' ADD CHECK ("' . $row->field . '" >= 0)'); } - db_query('DROP DOMAIN smallint_unsigned'); - db_query('DROP DOMAIN int_unsigned'); - db_query('DROP DOMAIN bigint_unsigned'); + db_query('DROP DOMAIN IF EXISTS smallint_unsigned'); + db_query('DROP DOMAIN IF EXISTS int_unsigned'); + db_query('DROP DOMAIN IF EXISTS bigint_unsigned'); } } diff --git a/modules/user/user.install b/modules/user/user.install index a2369684e..5c8791f85 100644 --- a/modules/user/user.install +++ b/modules/user/user.install @@ -690,7 +690,7 @@ function user_update_7012(&$sandbox) { // Initialize batch update information. $sandbox['progress'] = 0; $sandbox['last_user_processed'] = -1; - $sandbox['max'] = db_query("SELECT COUNT(*) FROM {users} WHERE picture <> 0")->fetchField(); + $sandbox['max'] = db_query("SELECT COUNT(*) FROM {users} WHERE picture <> ''")->fetchField(); } // As a batch operation move the photos into the {file_managed} table and |