Commit graph

979 commits

Author SHA1 Message Date
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
ADmad
ef4826eb70 Making Model::find('count') behave nicely when 'group' key is specified in options. Closes #1677 2011-08-14 07:37:23 +05:30
ADmad
7983b4109b Data returned by Model::save() not contains primary key too when new record is created. Closes #1869 2011-08-14 02:56:08 +05:30
Jose Lorenzo Rodriguez
1726bad396 Adding ability to Set class to iterate on ArrayObjects, or any object implementing ArrayAccess and Traversable 2011-08-11 13:26:06 -04:30
ADmad
9577fb0ca2 Fixed TreeBehavior::childCount(). Closes #1833 2011-07-31 12:39:52 +05:30
ADmad
b15c77ecc3 Enhancing validation messages to have placeholders. Closes #1855 2011-07-31 06:33:56 +05:30
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Ceeram
b8daa99cac Splitting saveAll into separate save and validation methods for many rows and associated rows. Closes ticket #1157 2011-07-25 09:39:03 +02:00
Jose Lorenzo Rodriguez
50d4330487 Ensuring uniqueness of method cache keys, all tests passing now 2011-07-17 23:45:22 -04:30
Jose Lorenzo Rodriguez
08be8300ee Merge branch '2.0' into 2.0-dbo-performance 2011-07-17 23:22:58 -04:30
Jose Lorenzo Rodriguez
222df2c315 Removing unneeded assert that fails when run in the all test suite 2011-07-17 23:12:51 -04:30
Jose Lorenzo Rodriguez
b603232aee Removing redundant call to DboSource::fields(), the fields come already quoted from DboSource::read() 2011-07-17 17:42:47 -04:30
José Lorenzo Rodríguez
7596fcf45a Merge pull request #153 from ajibarra/e4c1f28d849c6a60c369265a502315260babe80b
Preventing AppModel to be inspected inside CakeSchema
2011-07-15 14:48:01 -07:00
José Lorenzo Rodríguez
57a8c108a6 Merge pull request #147 from burzum/feature/2.0-return-query
Feature/2.0 return query
2011-07-15 14:10:08 -07:00
Alejandro Ibarra
e4c1f28d84 Included validation to skip AppModel on CakeSchema->readSchema because it tries to find 'app_models' table. Added testSchemaReadWithAppModel test 2011-07-15 15:18:38 -04:30
Florian Krmer
adb943b7fd Refactoring the code to build the query array as suggested here https://github.com/cakephp/cakephp/pull/147#issuecomment-1553663 2011-07-12 23:31:07 +02:00
Florian Krmer
9d7c97c296 Adding the "returnQuery" key to the 2nd argument of the find() method to be able to get the query array back from the before state of findMethod() calls. This was required in the past for some more complex queries and is in 2.0 no longer possible because the find methods became protected. 2011-07-12 01:04:22 +02:00
Majna
cde13daed4 Refactored DatabaseSession to use only 'Session.handler.model' config. Fixed static call on non-static method DatabaseSession::gc(). Fix for SessionFixture -primary key too long (MySQL Error: 1071) 2011-07-11 00:16:41 +02:00
Mark Story
08f1afe328 Updating varchar, text columns to use nvarchar.
This storage type stores unicode properly, and is the
saner default datatype for most applications.
Fixes #1321
2011-06-23 23:01:17 -07:00
Mark Story
6bcfd19ea7 Fixing tests that shouldn't have been changed. 2011-06-23 16:27:59 -07:00
Mark Story
9ab2ec7d49 Adding support for Unicode characters. Refs #1321 2011-06-23 15:46:03 -07:00
Mark Story
91a1cf81f3 Merge branch '1.3' into merger
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
e33a9a7846 Adding new limit/offset pagination for SQLServer 11. 2011-06-22 17:01:36 -07:00
Mark Story
1a155c80c0 Fixing support for nchar and nvarchar fields in SQL server.
These fields report their length as double of what its defined.
2011-06-22 11:39:06 -07:00
Mark Story
1df0801c33 Updating SQLServer test to pass when the app has a model. 2011-06-22 11:08:14 -07:00
Mark Story
a825d8280f Adding support for SQLServer's datetime2 column,
as that is the preferred datetime format in SQLServer.
2011-06-22 10:24:45 -07:00
Mark Story
0c1472ee44 Adding better support for nvarchar(MAX) in SQLServer
Newer versions of SQLServer perfer to use nvarchar(max) for
text columns.
2011-06-22 09:05:06 -07:00
Jose Lorenzo Rodriguez
d0ef655601 Using the field name for aliasing for Sqlsrv as in Postgres, removing dead code 2011-06-21 18:58:33 -04:30
Jose Lorenzo Rodriguez
97e51f1d94 Removing Sqlserver::value() as it is already abstracted in DboSource 2011-06-21 18:07:05 -04:30
Mark Story
4deedf6da2 Removing extra paging result that ends up because of SQLserver 10 workarounds. 2011-06-21 13:17:49 -07:00
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Jose Lorenzo Rodriguez
2a39e6869c Merge branch '2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Test/Case/Model/ConnectionManagerTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
2011-06-17 18:04:03 -04:30
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Juan Basso
aacb921695 Pattern to use skipIf in tests. 2011-05-30 20:51:36 -04:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
AD7six
dcf14a7a44 rename the model test such that is coincides with the file it's testing 2011-05-29 01:22:38 +02:00
ADmad
e5f2f6a236 Fixing test cases 2011-05-29 02:50:09 +05:30
Jose Lorenzo Rodriguez
e669a81e0a Reverting change in ConnectionManager, sourceList() will only return the instantiated datasources
Fixing remaining tests failing due to contamination of loaded plugin is app
2011-05-27 02:28:38 -04:30
Jose Lorenzo Rodriguez
b320e4323f Improving ConnectionManager tests 2011-05-27 02:13:35 -04:30
Renan Gonçalves
3f72c92226 Removing the unset(->db); since it trigger errors by the Fixture Manager when it tries to drop the created tables. 2011-05-24 19:56:45 +02:00
Renan Gonçalves
2ca849a068 Tests no longer have access to ->_fixtures, refactoring it to use Fixture Manager instead. 2011-05-24 19:56:04 +02:00
Renan Gonçalves
33d00380ed Fixing cross database tests by making sure the fixture was created for the right database. 2011-05-24 19:32:38 +02:00
Renan Gonçalves
423fa8127e Skipping Oracle tests if not using Oracle configuration. 2011-05-24 18:45:10 +02:00
Renan Gonçalves
a6ed66892e Including SqlServer and Oracle tests to the AllDatabase tests. 2011-05-24 18:41:51 +02:00
Juan Basso
02d4188a29 Skipping tests that is not compatible with SQL Server. 2011-05-23 23:16:13 -04:00
Juan Basso
0ae9974b3f Updating the test to be compatible with others dbo drivers. 2011-05-23 00:31:21 -04:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
Juan Basso
846634d729 Changed the test to be compatible with all tests. 2011-05-22 22:50:29 -04:00
Juan Basso
76831863e3 Skipping tests that is not compatible with SQL Server. 2011-05-22 22:21:01 -04:00
Juan Basso
195653bdfc Updated the Mssql tests with fixes of insertMulti. 2011-05-22 01:11:57 -04:00
Juan Basso
82e2d9e271 Updating model tests to support Mssql driver. 2011-05-22 00:59:15 -04:00
Juan Basso
11d249e43b Updating PHPDoc and method visibility. 2011-05-21 22:18:57 -04:00
Juan Basso
3e4cd4fdbb Removed the simulate flag that is not used. 2011-05-21 22:10:05 -04:00
Renan Gonçalves
c602fc845b Reverting the change to insertMulti, worked to solve the cache issue when trying to get the model schema. 2011-05-18 20:59:17 +02:00
Renan Gonçalves
37b9bd59bc Trying to fix the Mssql as much as possible.
Adding  parameter to the insertMulti() method because Mssql tries to get the table schema and it fails most of the time.
2011-05-18 20:12:36 +02:00
Renan Gonçalves
d1a984cde9 Resolving merge conflict. 2011-05-18 19:58:12 +02:00
AD7six
6e29bb4d94 fix ModelIntegrationTest part 1 2011-05-17 21:48:16 +02:00
Jose Lorenzo Rodriguez
7ef1a2995a Fixing failing tests due to massive search and replace 2011-05-16 23:45:35 -04:30
AD7six
0a53242e3e correcting all the inverted assertEqual tests
$expected is the first argument. Now certain test results start to make
sense:

	1) MultibyteTest::testUsingMbStrtolower
	Failed asserting that two strings are equal.
	--- Expected
	+++ Actual
	@@ @@
	-ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ
	+ⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥ
2011-05-17 00:49:00 +02:00
AD7six
8e27cf992f correct a few missing constant replacements 2011-05-15 18:49:38 +02:00
AD7six
afa8f6b441 remove LIBS constant
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
AD7six
bd0a303c09 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-05-15 11:28:47 +02:00
Jose Lorenzo Rodriguez
a6fb16beef Moving tests cases to their new location 2011-05-15 00:42:10 -04:30
Jose Lorenzo Rodriguez
91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
	lib/Cake/tests/Case/Log/Engine/FileLog.php
	lib/Cake/tests/Case/Log/Engine/FileLogTest.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Jose Lorenzo Rodriguez
7ba60ff424 Changing more paths 2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
8746a485bd Search and replace for changed paths 2011-05-13 02:53:35 -04:30
Jose Lorenzo Rodriguez
900dfef2f7 Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30