Commit graph

19 commits

Author SHA1 Message Date
Bart Visscher
5549c77ec5 Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Jörn Friedrich Dreyer
00987feda1 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 14:05:42 +02:00
Bart Visscher
769212a9a0 numRows doesn't work with Oracle 2013-06-24 22:38:19 +02:00
Bart Visscher
b980987e32 Doctrine only returns false 2013-06-24 22:38:19 +02:00
Jörn Friedrich Dreyer
1b97c186b4 use assertEquals number of rows in db tests 2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
0eed1c980d Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
fix fetchRow checks to also work with MDB2
2013-06-11 06:20:27 -07:00
Thomas Müller
74b1f7d448 Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
Jörn Friedrich Dreyer
875c18b115 fix fetchRow checks to also work with MDB2 2013-06-10 17:43:09 +02:00
Thomas Müller
b66559247a Merge pull request #3653 from owncloud/shorten_identifiers_in_tests
shorten table identifiers in tests
2013-06-10 08:38:54 -07:00
Jörn Friedrich Dreyer
fc27052887 shorten table identifiers in tests 2013-06-10 11:44:04 +02:00
Jörn Friedrich Dreyer
b6f8d2b859 raise failed tests from first commit to size @medium 2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer
124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
Thomas Mueller
ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Thomas Tanghus
88b91a7304 Swap expected and actual. 2012-11-04 12:33:32 +01:00
Thomas Tanghus
7c67d2fdd6 VCategories: Swap expected and actual in unit tests. 2012-11-04 12:09:54 +01:00
Thomas Tanghus
b434c20c18 Added unit test testinsertIfNotExistDontOverwrite. 2012-10-31 16:51:36 +01:00
Thomas Tanghus
1c9929d44f Added unit tests for OC_DB::insertIfNotExist() 2012-10-19 13:18:57 +02:00
Bart Visscher
f242e658c3 Fix the db tests when running all tests 2012-10-12 18:49:51 +02:00
Bart Visscher
35442e5474 Add unit tests for OC_DB 2012-10-12 15:47:41 +02:00