diff options
| author | David King <imkingdavid@gmail.com> | 2013-02-06 12:25:13 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-02-06 12:25:13 -0500 |
| commit | effaef6bddf49b9016d66bd64706392fcdb452b3 (patch) | |
| tree | b2fc1cba8a269453e5a1ec7667141e69a8d34429 /phpBB/includes/db/db_tools.php | |
| parent | 1e5a1b72dca4e0ccae9340467225499649dea6c8 (diff) | |
| parent | 77df9109b61ec93c28a8120a8d81a045961b24ac (diff) | |
| download | forums-effaef6bddf49b9016d66bd64706392fcdb452b3.tar forums-effaef6bddf49b9016d66bd64706392fcdb452b3.tar.gz forums-effaef6bddf49b9016d66bd64706392fcdb452b3.tar.bz2 forums-effaef6bddf49b9016d66bd64706392fcdb452b3.tar.xz forums-effaef6bddf49b9016d66bd64706392fcdb452b3.zip | |
Merge remote-tracking branch 'EXreaction/feature/migrations' into develop
* EXreaction/feature/migrations: (48 commits)
[feature/migrations] Remove default values from necessary parameters
[feature/migrations] Revert unrelated changes to functions.php
[ticket/9737] Fix some comments
[ticket/9737] Fix a few minor things in migrations
[feature/migrations] Make sure migration data not done before running data step
[feature/migrations] Function to populate the migrations table (for install)
[feature/migrations] Function effectively_installed() in migrations
[feature/migrations] Make load_migrations recursive (optionally)
[feature/migrations] Make the test depends_on methods static
[feature/migrations] Make depends_on static to call it without dependencies
[feature/migrations] install/database_update_migrations.php
[feature/migrations] Move test.php -> install/database_update_migrations.php
[feature/migrations] Store depends on in the database (serialized)
[feature/migrations] Revert method completed
[feature/migrations] Basic reverting test
[feature/migrations] Test for calling a step multiple times
[feature/migrations] Creating revert method to attempt reverting a migration
[feature/migrations] Some comments in db_tools
[feature/migrations] Reverse data functionality
[feature/migrations] Comment
...
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
Diffstat (limited to 'phpBB/includes/db/db_tools.php')
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index a4bf40fcd7..e8c26fa502 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -346,6 +346,17 @@ class phpbb_db_tools } /** + * Setter for {@link $return_statements return_statements}. + * + * @param bool $return_statements True if SQL should not be executed but returned as strings + * @return null + */ + public function set_return_statements($return_statements) + { + $this->return_statements = $return_statements; + } + + /** * Gets a list of tables in the database. * * @return array Array of table names (all lower case) @@ -674,6 +685,8 @@ class phpbb_db_tools * Handle passed database update array. * Expected structure... * Key being one of the following + * drop_tables: Drop tables + * add_tables: Add tables * change_columns: Column changes (only type, not name) * add_columns: Add columns to a table * drop_keys: Dropping keys |