diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-25 01:08:01 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-25 01:08:01 -0500 |
| commit | 372698218aa63e28147a52146c778a0805087ee4 (patch) | |
| tree | e5302520a353d54723c0a3d950570a0ec7d2defb | |
| parent | 58e35759d974d02df13ef6c2541910359be9e090 (diff) | |
| parent | e08e22ca127c24e9d958eb3025ed50a40f1dd8d8 (diff) | |
| download | forums-372698218aa63e28147a52146c778a0805087ee4.tar forums-372698218aa63e28147a52146c778a0805087ee4.tar.gz forums-372698218aa63e28147a52146c778a0805087ee4.tar.bz2 forums-372698218aa63e28147a52146c778a0805087ee4.tar.xz forums-372698218aa63e28147a52146c778a0805087ee4.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10483] Fix test suite when running with MySQL strict mode
| -rw-r--r-- | tests/dbal/fixtures/massmail_crossjoin.xml | 16 | ||||
| -rw-r--r-- | tests/dbal/fixtures/three_users.xml | 16 | ||||
| -rw-r--r-- | tests/session/fixtures/sessions_empty.xml | 16 | ||||
| -rw-r--r-- | tests/session/fixtures/sessions_full.xml | 16 |
4 files changed, 64 insertions, 0 deletions
diff --git a/tests/dbal/fixtures/massmail_crossjoin.xml b/tests/dbal/fixtures/massmail_crossjoin.xml index 801205eb81..ef0a2b7149 100644 --- a/tests/dbal/fixtures/massmail_crossjoin.xml +++ b/tests/dbal/fixtures/massmail_crossjoin.xml @@ -12,20 +12,36 @@ <column>user_id</column> <column>username</column> <column>username_clean</column> + <column>user_permissions</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> <row> <value>1</value> <value>mass email</value> <value>mass email</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>2</value> <value>banned</value> <value>banned</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>3</value> <value>not in group</value> <value>not in group</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> </table> <table name="phpbb_user_group"> diff --git a/tests/dbal/fixtures/three_users.xml b/tests/dbal/fixtures/three_users.xml index a6789f4a01..a50e3e8634 100644 --- a/tests/dbal/fixtures/three_users.xml +++ b/tests/dbal/fixtures/three_users.xml @@ -3,17 +3,33 @@ <table name="phpbb_users"> <column>user_id</column> <column>username_clean</column> + <column>user_permissions</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> <row> <value>1</value> <value>barfoo</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>2</value> <value>foobar</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>3</value> <value>bertie</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> </table> </dataset> diff --git a/tests/session/fixtures/sessions_empty.xml b/tests/session/fixtures/sessions_empty.xml index f94337314e..0e6ddccd88 100644 --- a/tests/session/fixtures/sessions_empty.xml +++ b/tests/session/fixtures/sessions_empty.xml @@ -3,17 +3,33 @@ <table name="phpbb_users"> <column>user_id</column> <column>username_clean</column> + <column>user_permissions</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> <row> <value>1</value> <value>anonymous</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>3</value> <value>foo</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>4</value> <value>bar</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> </table> <table name="phpbb_sessions"> diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml index bf6fc65997..509687f4d2 100644 --- a/tests/session/fixtures/sessions_full.xml +++ b/tests/session/fixtures/sessions_full.xml @@ -3,17 +3,33 @@ <table name="phpbb_users"> <column>user_id</column> <column>username_clean</column> + <column>user_permissions</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> <row> <value>1</value> <value>anonymous</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>3</value> <value>foo</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> <row> <value>4</value> <value>bar</value> + <value></value> + <value></value> + <value></value> + <value></value> </row> </table> <table name="phpbb_sessions"> |