Nils Adermann
fe93ceb20e
Merge pull request #1306 from bantu/ticket/11403
...
[ticket/11403] phpbb_notification_manager: Use SQL multi insert in batch...
2013-03-29 08:56:10 -07:00
Andreas Fischer
b156b22f35
[ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.
...
PHPBB3-11403
2013-03-29 16:53:50 +01:00
Andreas Fischer
6910d44154
[ticket/11403] phpbb_notification_manager: Use SQL multi insert in batches.
...
PHPBB3-11403
2013-03-29 16:37:04 +01:00
Nils Adermann
1b71779432
Merge pull request #1285 from EXreaction/ticket/11422
...
[ticket/11422] Increment assets when database_update is complete
2013-03-29 08:29:22 -07:00
Nils Adermann
e91077153e
Merge pull request #1315 from bantu/ticket/11469
...
[ticket/11469] Add SQL insert buffer allowing easier handling of multi i...
2013-03-29 08:27:09 -07:00
Tabitha Backoff
a8f5695666
Migration file and change board_home_text to board_index_text
2013-03-28 17:53:14 -04:00
Tabitha Backoff
9e5cde7f66
Ticket# 11477 - Allow customisation of "Board index"
2013-03-28 02:34:36 -04:00
Andreas Fischer
4bd5f279dc
[ticket/11469] Add comment about using bitwise operator.
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
e3a6935de6
[ticket/11469] Add more table status assertions.
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
e022a7e8f6
[ticket/11469] Remove comments. Method names should be good enough now.
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
a04fe625a8
[ticket/11469] Do not repeat markTestSkipped() message.
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
6f946e2188
[ticket/11469] Refactor get_three_rows() into get_rows($n).
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
eacd0f3e7d
[ticket/11469] Fix spacing in getDataSet().
...
PHPBB3-11469
2013-03-28 00:28:51 +01:00
Andreas Fischer
c909d9602b
[ticket/11469] Do not repeat assert_config_count(2). Also move to setUp().
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
b48c4d9549
[ticket/11469] Use setUp() to setup DB and a buffer with size 2.
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
1bd13acb75
[ticket/11469] Use multi insert property from DB. Do not copy value to buffer.
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
4132573088
[ticket/11469] Use buffer with a single element instead of extra code path.
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
b88eb3c8e0
[ticket/11469] Do not repeat row generation.
...
PHPBB3-11469
2013-03-28 00:28:50 +01:00
Andreas Fischer
873f098b6c
[ticket/11469] Do not repeat array with three rows.
...
PHPBB3-11469
2013-03-28 00:28:46 +01:00
Andreas Fischer
a534497d82
[ticket/11469] Move protected method to end of test file.
...
PHPBB3-11469
2013-03-28 00:22:07 +01:00
Andreas Fischer
edd4987030
Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469-2' into ticket/11469
...
* nickvergessen/ticket/bantu/11469-2:
[ticket/11469] Cast $result to boolean in insert_all()
[ticket/11469] Check return values of the functions
[ticket/11469] Split tests and skip multi_insert if unavailable
2013-03-27 23:14:38 +01:00
Joas Schilling
c9f059c4f2
[ticket/11469] Cast $result to boolean in insert_all()
...
|= returns integer values
PHPBB3-11469
2013-03-27 20:55:48 +01:00
Joas Schilling
69ad4aab78
[ticket/11469] Check return values of the functions
...
PHPBB3-11469
2013-03-27 20:55:08 +01:00
Joas Schilling
9606ccc202
[ticket/11469] Split tests and skip multi_insert if unavailable
...
PHPBB3-11469
2013-03-27 20:54:20 +01:00
Andreas Fischer
53f9e2131c
[ticket/11469] Add note about calling flush() after batch insert is done.
...
PHPBB3-11469
2013-03-27 19:27:27 +01:00
Andreas Fischer
dc766f29b4
[ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.
...
PHPBB3-11469
2013-03-27 19:19:26 +01:00
Andreas Fischer
8c5fcac232
[ticket/11469] Add benefits over collecting huge insert arrays to class doc.
...
PHPBB3-11469
2013-03-27 18:22:59 +01:00
Andreas Fischer
55fb87ff18
Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into ticket/11469
...
* nickvergessen/ticket/bantu/11469:
[ticket/11469] Use method to check config count, instead of repeating it
[ticket/11469] Return after sql_multi_insert when multi_insert is false
[ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
2013-03-27 18:11:49 +01:00
Andreas Fischer
43b6ae3fee
Merge remote-tracking branch 'phpbb/develop' into ticket/11469
...
* phpbb/develop:
[ticket/11476] Remove pass-by-reference from sql_mutli_insert
[ticket/11466] Remove old database driver files from PHPUnit exclude
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
[ticket/11460] Add default behaviour tests for notification and email types.
[ticket/11460] Configure functional test board email using dummy SMTP data.
[ticket/11460] Add test for whether post_email and topic_email are checked.
[ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
[ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
2013-03-27 18:11:38 +01:00
Andreas Fischer
94a15f85a6
[ticket/11469] Add example code to class documentation.
...
PHPBB3-11469
2013-03-27 18:11:31 +01:00
Andreas Fischer
b583f6d8d9
Merge remote-tracking branch 'nickvergessen/ticket/11476' into develop
...
* nickvergessen/ticket/11476:
[ticket/11476] Remove pass-by-reference from sql_mutli_insert
2013-03-27 17:55:42 +01:00
Joas Schilling
c629b2c7b3
[ticket/11476] Remove pass-by-reference from sql_mutli_insert
...
The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.
PHPBB3-11476
2013-03-27 15:01:36 +01:00
Joas Schilling
af9f30cd52
[ticket/11469] Use method to check config count, instead of repeating it
...
PHPBB3-11469
2013-03-27 14:09:04 +01:00
Joas Schilling
bf6f2c5875
[ticket/11469] Return after sql_multi_insert when multi_insert is false
...
PHPBB3-11469
2013-03-27 14:00:47 +01:00
Joas Schilling
8dd26dee83
[ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
...
PHPBB3-11469
2013-03-27 14:00:46 +01:00
Joas Schilling
bdd2062a66
[ticket/11474] Add test user with only global m_approve permissions
...
PHPBB3-11405
PHPBB3-11474
2013-03-27 11:12:33 +01:00
Nils Adermann
b7778f7fde
Merge remote-tracking branch 'github-bantu/ticket/11460' into develop
...
* github-bantu/ticket/11460:
[ticket/11460] Add default behaviour tests for notification and email types.
[ticket/11460] Configure functional test board email using dummy SMTP data.
[ticket/11460] Add test for whether post_email and topic_email are checked.
[ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
[ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
2013-03-27 06:31:53 +01:00
Nils Adermann
c9aa39be5d
Merge pull request #1318 from imkingdavid/ticket/11448
...
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
2013-03-26 15:19:28 -07:00
Nils Adermann
59e0196846
Merge pull request #1319 from imkingdavid/ticket/11466
...
[ticket/11466] Remove old database driver files from PHPUnit exclude
2013-03-26 15:16:43 -07:00
David King
6ab9ef54a2
[ticket/11466] Remove old database driver files from PHPUnit exclude
...
As per the ticket comments, these can simply be removed, rather than having to
be renamed to the new file locations.
PHPBB3-11466
2013-03-26 17:21:35 -04:00
David King
6dddc22ec7
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
...
Currently, the $user_id is a parameter but is not used. This patch fixes that.
PHPBB3-11448
2013-03-26 17:07:20 -04:00
Joas Schilling
d8a63047aa
[ticket/11474] Clarify comment with "global" and forum_id = 0
...
Forum ID 0 in permission checks, checks the global moderator permission.
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:51 +01:00
Joas Schilling
1af89968dd
[ticket/11474] Check read permission before sending *_in_queue notifications
...
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:26 +01:00
Joas Schilling
8a94e08e30
[ticket/11405] Add unit tests for post_in_queue
...
PHPBB3-11405
2013-03-26 20:17:26 +01:00
Joas Schilling
0f204595d9
[ticket/11405] Fix "only variables should be passed by reference"
...
PHPBB3-11405
2013-03-26 20:17:24 +01:00
Joas Schilling
81cf02e057
[ticket/11405] Order users in bookmark, in order to pass postgres tests
...
PHPBB3-11405
2013-03-26 13:54:33 +01:00
Marc Alexander
34cdbd0360
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
...
Conflicts:
phpBB/styles/prosilver/template/timezone.js
2013-03-26 13:18:54 +01:00
Marc Alexander
f0b0978538
[ticket/11314] Modify files to comply with coding standards
...
PHPBB3-11314
2013-03-26 13:13:33 +01:00
Joas Schilling
e20b0a4234
[ticket/11405] Use different fixtures so it's not a total mess
...
PHPBB3-11405
2013-03-26 13:06:04 +01:00
Joas Schilling
7e2f80ec0a
[ticket/11405] Add unit tests for bookmarking
...
PHPBB3-11405
2013-03-26 12:59:35 +01:00