diff options
| author | David King <imkingdavid@gmail.com> | 2013-02-28 10:44:49 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-02-28 10:44:49 -0500 |
| commit | 0808e08c0b9c1f6baf80365341385e06a1d35d0f (patch) | |
| tree | 59a2f734d58d05b5cd9a43675c8290bdb85fbb71 | |
| parent | e20da8fb8138d8dbd345d75201cf12fb8ce3d370 (diff) | |
| parent | 51651b3d9f8622a195d877bbcf106acd413aee03 (diff) | |
| download | forums-0808e08c0b9c1f6baf80365341385e06a1d35d0f.tar forums-0808e08c0b9c1f6baf80365341385e06a1d35d0f.tar.gz forums-0808e08c0b9c1f6baf80365341385e06a1d35d0f.tar.bz2 forums-0808e08c0b9c1f6baf80365341385e06a1d35d0f.tar.xz forums-0808e08c0b9c1f6baf80365341385e06a1d35d0f.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11370' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11370:
[ticket/11370] Effectively installed migrations not inserted into table
| -rw-r--r-- | phpBB/includes/db/migrator.php | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php index d6bcae6ca6..89b253bc8c 100644 --- a/phpBB/includes/db/migrator.php +++ b/phpBB/includes/db/migrator.php @@ -332,7 +332,6 @@ class phpbb_db_migrator if (!isset($this->migration_state[$name])) { $state['migration_start_time'] = time(); - $this->insert_migration($name, $state); } } @@ -361,14 +360,7 @@ class phpbb_db_migrator } } - $insert = $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; + $this->insert_migration($name, $state); return true; } @@ -440,14 +432,7 @@ class phpbb_db_migrator $state['migration_data_done'] = ($result === true) ? false : true; } - $insert = $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; + $this->insert_migration($name, $state); } 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 array $state @@ -669,12 +654,22 @@ class phpbb_db_migrator protected function insert_migration($name, $state) { $migration_row = $state; - $migration_row['migration_name'] = $name; $migration_row['migration_depends_on'] = serialize($state['migration_depends_on']); - $sql = 'INSERT INTO ' . $this->migrations_table . ' - ' . $this->db->sql_build_array('INSERT', $migration_row); - $this->db->sql_query($sql); + if (isset($this->migration_state[$name])) + { + $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; } |