GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix for schema_version checksum table when checking schemas before the table's been added. :)

Browse Source
This commit is contained in:
Brion Vibber
2011-02-28 11:19:47 -08:00
parent 836f4ea6ea
commit 8cdf8cf33e
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/schemaupdater.php
View File

@@ -95,11 +95,20 @@ class SchemaUpdater
{ {
$checksums = array(); $checksums = array();
$sv = new Schema_version(); PEAR::pushErrorHandling(PEAR_ERROR_EXCEPTION);
$sv->find(); try {
while ($sv->fetch()) { $sv = new Schema_version();
$checksums[$sv->table_name] = $sv->checksum; $sv->find();
while ($sv->fetch()) {
$checksums[$sv->table_name] = $sv->checksum;
}
return $checksums;
} catch (Exception $e) {
// no dice!
common_log(LOG_DEBUG, "Possibly schema_version table doesn't exist yet.");
} }
PEAR::popErrorHandling();
return $checksums; return $checksums;
} }
@@ -112,15 +121,22 @@ class SchemaUpdater
*/ */
protected function saveChecksum($table, $checksum) protected function saveChecksum($table, $checksum)
{ {
$sv = new Schema_version(); PEAR::pushErrorHandling(PEAR_ERROR_EXCEPTION);
$sv->table_name = $table; try {
$sv->checksum = $checksum; $sv = new Schema_version();
$sv->modified = common_sql_now(); $sv->table_name = $table;
if (isset($this->checksums[$table])) { $sv->checksum = $checksum;
$sv->update(); $sv->modified = common_sql_now();
} else { if (isset($this->checksums[$table])) {
$sv->insert(); $sv->update();
} else {
$sv->insert();
}
} catch (Exception $e) {
// no dice!
common_log(LOG_DEBUG, "Possibly schema_version table doesn't exist yet.");
} }
PEAR::popErrorHandling();
$this->checksums[$table] = $checksum; $this->checksums[$table] = $checksum;
} }
} }