makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11370] Effectively installed migrations not inserted into table

Browse source 
insert_migration() function now handles inserting/updating

Move all insert/update code to insert_migration() function to prevent this from occurring again.

PHPBB3-11370
This commit is contained in:
Nathaniel Guse 2013-02-26 19:44:03 -06:00
parent 80bd78a5e5
commit 51651b3d9f
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
phpBB/includes/db/migrator.php
View file

@ -332,7 +332,6 @@ class phpbb_db_migrator
if (!isset($this->migration_state[$name])) if (!isset($this->migration_state[$name]))
{ {
$state['migration_start_time'] = time(); $state['migration_start_time'] = time();
$this->insert_migration($name, $state);
} }
} }
@ -361,14 +360,7 @@ class phpbb_db_migrator
} }
} }
$insert = $state; $this->insert_migration($name, $state);
$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
$sql = 'UPDATE ' . $this->migrations_table . '
SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
$this->db->sql_query($sql);
$this->migration_state[$name] = $state;
return true; return true;
} }
@ -440,14 +432,7 @@ class phpbb_db_migrator
$state['migration_data_done'] = ($result === true) ? false : true; $state['migration_data_done'] = ($result === true) ? false : true;
} }
$insert = $state; $this->insert_migration($name, $state);
$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
$sql = 'UPDATE ' . $this->migrations_table . '
SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
$this->db->sql_query($sql);
$this->migration_state[$name] = $state;
} }
else else
{ {
@ -660,7 +645,7 @@ class phpbb_db_migrator
} }
/** /**
* Insert migration row into the database * Insert/Update migration row into the database
* *
* @param string $name Name of the migration * @param string $name Name of the migration
* @param array $state * @param array $state
@ -669,12 +654,22 @@ class phpbb_db_migrator
protected function insert_migration($name, $state) protected function insert_migration($name, $state)
{ {
$migration_row = $state; $migration_row = $state;
$migration_row['migration_name'] = $name;
$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']); $migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
$sql = 'INSERT INTO ' . $this->migrations_table . ' if (isset($this->migration_state[$name]))
' . $this->db->sql_build_array('INSERT', $migration_row); {
$this->db->sql_query($sql); $sql = 'UPDATE ' . $this->migrations_table . '
SET ' . $this->db->sql_build_array('UPDATE', $migration_row) . "
WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
$this->db->sql_query($sql);
}
else
{
$migration_row['migration_name'] = $name;
$sql = 'INSERT INTO ' . $this->migrations_table . '
' . $this->db->sql_build_array('INSERT', $migration_row);
$this->db->sql_query($sql);
}
$this->migration_state[$name] = $state; $this->migration_state[$name] = $state;
} }