diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-27 18:20:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-27 18:20:44 +0200 |
| commit | 8870d0701f791466badee063c8af8044995698d9 (patch) | |
| tree | 5d7166acda45d4e5c573f58d2f54aa4f76895418 /tests | |
| parent | f0d8168e81e2e140e200e2832afce0b66a235c6d (diff) | |
| parent | 555f0529f2a256545d67208a2bd1af1adfb92c41 (diff) | |
| download | forums-8870d0701f791466badee063c8af8044995698d9.tar forums-8870d0701f791466badee063c8af8044995698d9.tar.gz forums-8870d0701f791466badee063c8af8044995698d9.tar.bz2 forums-8870d0701f791466badee063c8af8044995698d9.tar.xz forums-8870d0701f791466badee063c8af8044995698d9.zip | |
Merge remote-tracking branch 'bantu/ticket/11573' into develop
* bantu/ticket/11573:
[ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.
[ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functions/fixtures/style_select.xml | 4 | ||||
| -rw-r--r-- | tests/user/fixtures/user_loader.xml | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/tests/functions/fixtures/style_select.xml b/tests/functions/fixtures/style_select.xml index 12d6392ab5..ca95f94461 100644 --- a/tests/functions/fixtures/style_select.xml +++ b/tests/functions/fixtures/style_select.xml @@ -4,20 +4,24 @@ <column>style_id</column> <column>style_name</column> <column>style_active</column> + <column>style_parent_tree</column> <row> <value>1</value> <value>prosilver</value> <value>1</value> + <value></value> </row> <row> <value>2</value> <value>subsilver2</value> <value>1</value> + <value></value> </row> <row> <value>3</value> <value>zoo</value> <value>0</value> + <value></value> </row> </table> </dataset> diff --git a/tests/user/fixtures/user_loader.xml b/tests/user/fixtures/user_loader.xml index 737376f326..1fed8b5838 100644 --- a/tests/user/fixtures/user_loader.xml +++ b/tests/user/fixtures/user_loader.xml @@ -2,22 +2,38 @@ <dataset> <table name="phpbb_users"> <column>user_id</column> + <column>user_permissions</column> <column>username</column> <column>username_clean</column> + <column>user_sig</column> + <column>user_occ</column> + <column>user_interests</column> <row> <value>1</value> + <value></value> <value>Guest</value> <value>guest</value> + <value></value> + <value></value> + <value></value> </row> <row> <value>2</value> + <value></value> <value>Admin</value> <value>admin</value> + <value></value> + <value></value> + <value></value> </row> <row> <value>3</value> + <value></value> <value>Test</value> <value>test</value> + <value></value> + <value></value> + <value></value> </row> </table> </dataset> |