1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-17 21:10:00 +02:00

597 Commits

Author SHA1 Message Date
Nathan Guse
11ca2c15d6 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
2013-02-28 10:27:16 -06:00
David King
1eead4da97 Merge remote-tracking branch 'EXreaction/ticket/11363' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363:
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11363] Load module info files for extensions too
2013-02-28 11:19:30 -05:00
David King
b1735e30bd Merge remote-tracking branch 'EXreaction/ticket/11372' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11372:
  [ticket/11372] Migrator should only check if effectively installed if not
2013-02-28 11:17:23 -05:00
Nathan Guse
f665a4b5cf Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11370] Effectively installed migrations not inserted into table
  [ticket/11369] Reverting migration throws error
2013-02-28 09:52:23 -06:00
David King
0808e08c0b 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
2013-02-28 10:44:49 -05:00
Nathaniel Guse
c3434dec40 [ticket/11363] Fix a couple bugs and throw errors if the file not found
PHPBB3-11363
2013-02-27 14:09:27 -06:00
Nathaniel Guse
9b554fbf3c [ticket/11372] Migrator should only check if effectively installed if not
installed at all

PHPBB3-11372
2013-02-27 13:52:45 -06:00
Joas Schilling
3362baca51 [ticket/10411] Add migrations file for teampage table
PHPBB3-10411
2013-02-27 19:27:30 +01:00
Nathaniel Guse
d296e809d5 [ticket/11363] Load module info files for extensions too
Use the acp_modules::get_module_infos function instead of our own include code

PHPBB3-11363
2013-02-27 11:12:18 -06:00
Nathaniel Guse
c6aabab039 [ticket/11103] Notifications Migration file
PHPBB3-11103
2013-02-26 19:54:47 -06:00
Nathaniel Guse
51651b3d9f [ticket/11370] Effectively installed migrations not inserted into table
insert_migration() function now handles inserting/updating

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

PHPBB3-11370
2013-02-26 19:44:03 -06:00
Nathaniel Guse
f9cbf5b4c7 [ticket/11369] Reverting migration throws error
String is attempted to be unserialized

PHPBB3-11369
2013-02-26 19:25:51 -06:00
David King
80bd78a5e5 Merge remote-tracking branch 'EXreaction/ticket/11367' into develop
# By Nathan Guse (1) and Nathaniel Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11367:
  [ticket/11367] Always freeresult
  [ticket/11367] Migrator throws error if migrations table does not exist
2013-02-26 15:46:08 -05:00
Nathan Guse
9a319fefb2 [ticket/11367] Always freeresult
PHPBB3-11367
2013-02-26 10:22:13 -06:00
Nathaniel Guse
6045aa7aa2 [ticket/11367] Migrator throws error if migrations table does not exist
Force load_migration_state to not throw errors if the table does not exist.

PHPBB3-11367
2013-02-25 19:16:29 -06:00
Nathaniel Guse
4bf64b5e38 [feature/migrations] Fully revert the removal of the user_msnm field
PHBB3-9737
2013-02-23 15:10:21 -06:00
Nathaniel Guse
213bc09743 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data
Conflicts:
	phpBB/install/database_update.php
2013-02-23 15:05:47 -06:00
Nathan Guse
f6bb14569b [feature/migrations] getLocalisedMessage function for migration exception
PHPBB3-11351
2013-02-15 22:19:24 -06:00
Nathaniel Guse
f9a1b27a99 [feature/migrations] Fix unfulfillable function
Returned unfulfillable name in the wrong place previously

PHPBB3-11351
2013-02-09 21:16:39 -06:00
Nathaniel Guse
f18b096df9 [feature/migrations] getParameters function for migration exception
PHPBB3-11351
2013-02-09 21:10:56 -06:00
Nathaniel Guse
cacaffee6e [feature/migrations] Add language strings for migrations errors
Unfulfillable returns string of the missing dependency name now if
the migration is unfulfillable (this is significantly more helpful).

PHPBB3-11351
2013-02-09 20:56:42 -06:00
Igor Wiedler
fa33eae556 Merge remote-tracking branch 'exreaction/ticket/11350' into develop
* exreaction/ticket/11350:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
2013-02-07 00:56:31 +01:00
Nathaniel Guse
daf243026a [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
PHPBB3-11350
2013-02-06 13:08:35 -06:00
Nathan Guse
a665ad5c2e [feature/migrations] Remove user_msnm migration
PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
e4afb68dc3 [feature/migrations] Correct depends_on
PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
58507f250b [feature/migrations] Subdirectories for migration data
Organization will set you free

PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
747e514918 [feature/migrations] Reports table schema changes in recent develop
PHPBB3-9737
2013-02-06 11:35:55 -06:00
Nathan Guse
5e69e1a761 [feature/migrations] effectively installed check for migration data
PHPBB3-9737
2013-02-06 11:35:55 -06:00
Nathan Guse
dfcf9966e9 [feature/migrations] Comments for the return in the custom functions
PHPBB3-11318
2013-02-06 11:35:54 -06:00
Nathan Guse
8baceacc36 [feature/migrations] Fix migrations installer, schema for schema_data.sql
PHPBB3-11318
2013-02-06 11:35:53 -06:00
Nathan Guse
74f4397451 [feature/migrations] Make depends_on static to call it without dependencies
Move installing migrations to migration/install.php and handle figuring
out what migrations have been installed based on phpBB version.

PHPBB3-11318
2013-02-06 11:35:53 -06:00
Nathan Guse
ca55f6c481 [feature/migrations] Revert schema for migration data
PHPBB3-9737
2013-02-06 11:35:52 -06:00
Nathan Guse
fb4f7470d4 [feature/migrations] Rebuilding migrations data on develop
So this is easy to merge later.

PHPBB3-9737
2013-02-06 11:34:11 -06:00
David King
effaef6bdd 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
2013-02-06 12:25:13 -05:00
Nathaniel Guse
77df9109b6 [feature/migrations] Remove default values from necessary parameters
Clean up some comments

PHPBB3-9737
2013-02-04 13:46:23 -06:00
Nathaniel Guse
7338bfe3f0 [ticket/9737] Fix some comments
PHPBB3-9737
2013-01-23 09:45:20 -06:00
Nathaniel Guse
dfabdbca50 [ticket/9737] Fix a few minor things in migrations
PHPBB3-9737
2013-01-22 13:19:49 -06:00
Nathan Guse
e9a3f09074 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympus
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:24:58 -06:00
Nathan Guse
28e0520fe4 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:22:06 -06:00
Nathan Guse
ccd08e21f6 [feature/migrations] Make sure migration data not done before running data step
PHPBB3-9737
2013-01-13 13:34:16 -06:00
Nathan Guse
000b8fefd2 [feature/migrations] Function to populate the migrations table (for install)
PHPBB3-9737
2013-01-13 13:21:01 -06:00
Nathan Guse
26c16559c3 [feature/migrations] Function effectively_installed() in migrations
Allows you to check if the migration is effectively installed
(entirely optionall)

This function is intended to help moving to migrations from a
previous database updater, where some migrations may have been
installed already even though they are not yet listed in the
migrations table.

PHPBB3-9737
2013-01-13 12:39:08 -06:00
Nathan Guse
93f9ebbb25 [feature/migrations] Make load_migrations recursive (optionally)
PHPBB3-9737
2013-01-12 18:27:33 -06:00
Nathan Guse
db4fcab3bb [feature/migrations] Make depends_on static to call it without dependencies
PHPBB3-11318
2013-01-10 22:29:49 -06:00
Nathan Guse
d50500860f [feature/migrations] Store depends on in the database (serialized)
This is required so that when migrations are reverted we can check through
all installed migrations and make sure that all dependencies are handled
properly and so that we are only required to load the migrations files
that could be dependent on the ones installed.

I believe in normal proper use the old way might have worked, but in case
something happens and an unrelated migration file is installed, but cannot
be loaded, this makes sure we do not stop everything unless we absolutely
must (one of those files is dependent on something we want to revert).

PHPBB3-9737
2013-01-10 15:09:51 -06:00
Nathan Guse
dbe71bb170 [feature/migrations] Revert method completed
PHPBB3-9737
2013-01-10 13:53:09 -06:00
Nathan Guse
44c10f661e [feature/migrations] Creating revert method to attempt reverting a migration
This code is in progress

PHPBB3-9737
2013-01-09 18:59:15 -06:00
Nathan Guse
595246f9bf [feature/migrations] Some comments in db_tools
PHPBB3-9737
2013-01-09 18:55:55 -06:00
Nathan Guse
3d4c00619f [feature/migrations] Reverse data functionality
If data step fails, attempt to roll back any previous calls from the
migration that failed.

Fix some failing tests

PHPBB3-9737
2013-01-09 18:24:32 -06:00
Nathan Guse
5f9e1f1e89 [feature/migrations] Make sure the path sent to load_migrations is a directory
Prevent a lot++ of errors

PHPBB3-9737
2013-01-09 16:56:26 -06:00