1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

6631 Commits

Author SHA1 Message Date
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
Andreas Fischer
336187151a [ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Andreas Fischer
01045a6bb0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:39 +01:00
Nathaniel Guse
75244eafd9 [feature/migrations] Revert unrelated changes to functions.php
PHPBB3-9737
2013-01-30 16:20:50 -06:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
2013-01-30 21:46:15 +05:30
Oleg Pudeyev
2df2f27b96 Merge PR #1219 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:46:11 -05:00
Andreas Fischer
5a146df07f [ticket/11343] Remove spare parentheses.
PHPBB3-11343
2013-01-25 19:52:02 +01:00
Andreas Fischer
8421aa0b0e [ticket/11343] Remove spare space.
PHPBB3-11343
2013-01-25 19:51:17 +01:00
Andreas Fischer
305b2b8f48 [ticket/11343] Use === when checking stored user_actkey against user input.
Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
2013-01-25 19:49:02 +01: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
Joas Schilling
6a972da4c7 [ticket/9492] Fix typo in SQL query
PHPBB3-9492
2013-01-20 20:58:46 +01:00
Joas Schilling
9a6219d8b3 [ticket/9492] Ensure to delete the avatar/rank data when we change it
PHPBB3-9492
2013-01-17 14:45:40 +01:00
Joas Schilling
bd87b06858 [ticket/9492] Ensure to update all avatar values when the avatar is changed
PHPBB3-9492
2013-01-17 14:43:00 +01:00
Joas Schilling
64c27013d4 [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
PHPBB3-9492
2013-01-17 14:40:58 +01:00
Joas Schilling
3122aeff26 [ticket/9492] Retain custom ranks and avatars when setting users default group
PHPBB3-9492
2013-01-17 14:32:15 +01: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
d59431691c Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11201:
  [ticket/11201] Remove database column on update
  [ticket/11201] Remove MSN/WLM fields
2013-01-15 18:54:11 -06:00
Nathan Guse
a2f6e494f3 Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
  [ticket/11171] Moved the DB schema changes to its place
  [ticket/11171] Cleanup of leftovers
  [ticket/11171] Adapted the code in report.php
  [ticket/11171] Use the options stored to decide how to show it
  [ticket/11171] DB changes for the update
  [ticket/11171] DB additions for these changes

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-01-14 12:16:59 -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
Joas Schilling
9affd6f7e7 [ticket/11201] Remove MSN/WLM fields
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
2013-01-11 14:32:44 +01: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
Nathan Guse
445667a62e [feature/migrations] Fix if method (and create a test for it)
PHPBB3-9737
2013-01-09 16:44:10 -06:00
Nathan Guse
f56e400cd3 [feature/migrations] Comments
PHPBB3-9737
2013-01-09 16:44:09 -06:00
Nathan Guse
edf693e3bd [feature/migrations] Store state properly and send past result to callable
Fix return on module add

PHPBB3-9737
2013-01-09 16:44:09 -06:00
Nathan Guse
e3737978f7 [feature/migrations] Fixing returns of callables and handling data state
Lots of comments and some other miscellaneous fixes.

PHPBB3-9737
2013-01-09 16:44:08 -06:00
Nathan Guse
e9bcea5d82 [feature/migrations] Restore update_helpers.php file
This should be removed by the data branch

PHPBB3-9737
2013-01-09 16:44:08 -06:00
Nathan Guse
aceadfd77b [feature/migrations] Remove migration data (separate PR)
PHPBB3-9737
2013-01-09 16:44:07 -06:00
Nathan Guse
5c91e2569c [feature/migrations] Migrations now somewhat works
PHPBB3-9737
2013-01-09 16:44:07 -06:00
David King
826607a405 [feature/migrations] Add method and property visibility, use __construct()
PHPBB3-9737
2013-01-09 16:44:06 -06:00
David King
61debcf14c [feature/migrations] Update phpbb_db_migrator class for PHP 5.3.3
PHPBB3-9737
2013-01-09 16:44:06 -06:00
David King
ced035788b [feature/migrations] Update phpbb_db_migration class for PHP 5.3.3
PHPBB3-9737
2013-01-09 16:44:05 -06:00
Nathan Guse
6c44dadecb [feature/migrations] Move migrator to service container
Version numbers

3.1 updates

Restore database_update.php file to what it was in develop

Get first forum to place global announcements in

PHPBB3-9737
2013-01-09 16:44:05 -06:00
Nils Adermann
41de95bc11 [feature/migrations] Process migration steps and move to PHP5 code 2013-01-09 16:42:48 -06:00
Nathan Guse
82efb3e446 [feature/migrations] Remove references as it is now 3.1 code
PHPBB3-9737
2013-01-09 16:42:47 -06:00
Nils Adermann
91a921a96b [feature/migrations] Change migration data processing to run step by step 2013-01-09 16:42:47 -06:00
Nathan Guse
ce021710fb [feature/migrations] Rename classes, depends on
PHPBB3-9737
2013-01-09 16:42:46 -06:00