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.
This commit is contained in:
Joas Schilling 2013-05-27 18:20:44 +02:00
commit 8870d0701f
2 changed files with 20 additions and 0 deletions

View file

@ -4,20 +4,24 @@
<column>style_id</column> <column>style_id</column>
<column>style_name</column> <column>style_name</column>
<column>style_active</column> <column>style_active</column>
<column>style_parent_tree</column>
<row> <row>
<value>1</value> <value>1</value>
<value>prosilver</value> <value>prosilver</value>
<value>1</value> <value>1</value>
<value></value>
</row> </row>
<row> <row>
<value>2</value> <value>2</value>
<value>subsilver2</value> <value>subsilver2</value>
<value>1</value> <value>1</value>
<value></value>
</row> </row>
<row> <row>
<value>3</value> <value>3</value>
<value>zoo</value> <value>zoo</value>
<value>0</value> <value>0</value>
<value></value>
</row> </row>
</table> </table>
</dataset> </dataset>

View file

@ -2,22 +2,38 @@
<dataset> <dataset>
<table name="phpbb_users"> <table name="phpbb_users">
<column>user_id</column> <column>user_id</column>
<column>user_permissions</column>
<column>username</column> <column>username</column>
<column>username_clean</column> <column>username_clean</column>
<column>user_sig</column>
<column>user_occ</column>
<column>user_interests</column>
<row> <row>
<value>1</value> <value>1</value>
<value></value>
<value>Guest</value> <value>Guest</value>
<value>guest</value> <value>guest</value>
<value></value>
<value></value>
<value></value>
</row> </row>
<row> <row>
<value>2</value> <value>2</value>
<value></value>
<value>Admin</value> <value>Admin</value>
<value>admin</value> <value>admin</value>
<value></value>
<value></value>
<value></value>
</row> </row>
<row> <row>
<value>3</value> <value>3</value>
<value></value>
<value>Test</value> <value>Test</value>
<value>test</value> <value>test</value>
<value></value>
<value></value>
<value></value>
</row> </row>
</table> </table>
</dataset> </dataset>