Commit graph

116 commits

Author SHA1 Message Date
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +02:00
kaz29
5eb4c5c6da Fixing bug in getEncoding/setEncoding for PostgreSQL.
Fixes #2028

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
924e283012 Making test less specific as this float cast is different
on different installs.
2011-10-06 21:58:11 -04:00
mark_story
d9e51acf0a Fixing failing tests caused by merge with 1.3 2011-10-06 21:23:35 -04:00
mark_story
055224ef68 Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
Jose Lorenzo Rodriguez
ade9e4d154 Fixing another postgres failing test 2011-10-05 21:36:36 -04:30
Jose Lorenzo Rodriguez
16ffee0065 More fixes in checking dates in tests 2011-10-05 12:16:00 -04:30
Jose Lorenzo Rodriguez
746062d4a4 Fixing a couple of problem when testing dates in ModelWriteTest 2011-10-05 10:16:38 -04:30
Jose Lorenzo Rodriguez
0a2553cce5 Making model tests less time dependent 2011-10-03 14:51:07 -04:30
mark_story
3907c2bdf3 Fixing build failure in Postgres. 2011-10-01 22:49:57 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Jose Lorenzo Rodriguez
5d19b6ded9 Removing test ins porstgres that wasn't actually testing a thing, and making another postgres test pass 2011-10-01 15:25:17 -04:30
Jose Lorenzo Rodriguez
61be5b1d5c Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-01 14:08:56 -04:30
Jose Lorenzo Rodriguez
b8aa000589 Re-implementing Mysql::listDetailedSources() to not use prepared statements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times. 2011-10-01 14:06:41 -04:30
mark_story
d9db8c8124 Fixing failing test on postgres build. 2011-10-01 09:08:18 -04:00
mark_story
df82aa09e4 Removing test that causes problems in AllTests. 2011-09-30 22:47:47 -04:00
mark_story
af4b0c9c1b Make DboSource::lastError() fallback to the connection.
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError().  Mocking PDO is a pain.
Fixes #2046
2011-09-30 21:56:39 -04:00
mark_story
a3f25ee5e3 Fixing issue with integer columns and NULL values.
Fixes #2037
2011-09-29 20:28:52 -04:00
Jose Lorenzo Rodriguez
fbdb058441 Converting regular expression assertions to simple string contains, those perform faster and consume less memory 2011-09-29 00:05:15 -04:30
Jose Lorenzo Rodriguez
7b3ceb5a29 Fixing a few failing test cases and attempting to work around php segmentation fault when running the complete test suite 2011-09-28 22:57:50 -04:30
ADmad
33030a4502 Fixing my previous attempt in ef4826e to make Model::_findCount() behave nicely with 'group' option. Refs #1677, #573 2011-09-28 02:58:48 +05:30
mark_story
7e44836837 Fixing failing test. 2011-09-26 21:46:25 -04:00
Yosuke Basuke Suzuki
5612d411f3 Added unittest for saveAll() validation with the data no id assigned. 2011-09-23 22:23:26 +09:00
mark_story
8d43764801 Fix issue with duplicate associations when using string form.
Fixes #2002
2011-09-18 12:26:59 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
mark_story
09e7f1d491 Splitting apart the Scaffold and ScaffoldView tests.
Fixes #1985
2011-09-16 22:08:19 -04:00
Renan Gonçalves
4378bb6dc4 Fixed bug in CakeSchema where it determines the field position.
- Respective tests were added.
- Schema files will now have 'after' => 'previous_field' on it.
2011-09-16 15:28:28 +02:00
Jelle Henkens
7ba2f90b2a Refactoring expectError() calls to PHPUnit annotations 2011-09-13 19:56:37 +01:00
mark_story
d74f442608 Making test case class names match file names.
Refs #1985
2011-09-12 23:01:04 -04:00
ADmad
97a975c6c4 Refactoring Model::invalidFields() a bit. 2011-09-12 05:10:34 +05:30
mark_story
39c270fd84 Attempting to fix build failure in Jenkins. 2011-09-05 21:53:29 -04:00
Jose Lorenzo Rodriguez
12c73806f4 Skipping tests on Sqlite that involve creating a duplicate connection/ It is not possible to open multiple connections to it 2011-09-03 21:07:40 -04:30
Jose Lorenzo Rodriguez
149deba416 Fixing Mysql test case after making the DboSource throw exceptions 2011-09-03 19:12:06 -04:30
Jose Lorenzo Rodriguez
74ba030e7c More postgres tests passing again 2011-09-03 18:34:11 -04:30
Jose Lorenzo Rodriguez
61ff8d6154 Making DboSource tests more portable 2011-09-03 18:07:26 -04:30
Jose Lorenzo Rodriguez
d06d5f8738 Not checking length on databases that won't return it for floats 2011-09-03 17:21:48 -04:30
Jose Lorenzo Rodriguez
fcf58371fd Fixing a failing postgres test 2011-09-03 17:09:41 -04:30
Jose Lorenzo Rodriguez
7003edeb8f Adding missing expectedException annotations 2011-09-03 17:05:09 -04:30
Jose Lorenzo Rodriguez
0ca8af2c22 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-03 17:01:49 -04:30
Jose Lorenzo Rodriguez
f0ef0aab62 Making postgres tests pass 2011-09-03 17:00:16 -04:30
mark_story
2c21fc90fb Fixing failing tests and issues with Sqlite. 2011-09-03 22:07:45 +01:00
Jose Lorenzo Rodriguez
49b8b24ac2 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-03 13:09:04 -04:30
mark_story
2ceea79862 Fixing errors and failing tests with SQLite.
Seems that MySQL is extremely permissive with NOT NULL fields.
SQLite is more strict it seems.
2011-09-03 18:37:29 +01:00
Jose Lorenzo Rodriguez
36470f4a86 Removing $error property from DboSource, errors in queries will throw exceptions now 2011-09-03 12:17:00 -04:30
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
mark_story
85d9b1af8d Fixing failing tests caused by path/object cache issues. 2011-09-03 01:14:51 +01:00
Juan Basso
e9390985ca Changed mergeAssociation scrubQueryData to be protected. 2011-08-21 21:27:35 -04:00
Juan Basso
a1a049c700 Merge remote-tracking branch 'origin/2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/View/Helper/CacheHelper.php
2011-08-20 01:47:27 -04:00
ADmad
c3884f407f Implemented feature to allow multiple counter caches per associated model. 2011-08-17 18:10:32 +05:30
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00