mark_story
d8bc13f996
Fix incorrect time handling in deconstruct()
...
Apply patch from 'Amit Badkas' to solve issues where invalid times
were treated as valid.
Re-structure tests to use a dataprovider instead of copy + paste.
Fixes #2412
2011-12-26 10:03:14 -05:00
ADmad
ba27c8c201
Added multi-model fieldList support
2011-12-23 02:07:48 +05:30
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
Fitorec
e7c913acba
Fix unreachable code in Model mergeVars
...
Squashed commit of the following:
commit c8326460a422ad6cdca5afa4dd0dee
2011-12-18 10:38:17 -05:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Kyle Robinson Young
060e225b76
Add test for Model::getID(), simplify return and remove dated @see link
2011-12-13 22:19:50 -08:00
Rachman Chavik
90af608489
keep existing data in unique HABTM closes LH 275
...
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
Jose Lorenzo Rodriguez
73aeb6ba62
Lazy-loading the $tablePrefix property in models, Fixes #2277
2011-12-08 00:10:22 -04:30
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
mark_story
0670b96c24
Fix issue with incorrect date handling.
...
Fixes #2321
2011-12-03 14:38:55 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
65b87af6c0
Adding set to autoloader.
...
Fixes #2319
2011-11-30 21:14:39 -05:00
Ceeram
b5c4b85601
Fixing cascading delete, when using foreignKey false and setting condition on hasOne.
2011-11-30 20:02:36 +01:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Rachman Chavik
fd07b961d4
Use the correct datasource when saving multiple model
2011-11-25 22:29:23 +07:00
Rachman Chavik
144b556d1f
Adding new property Model::schemaName
...
Just like physical table name, the schema name is an important information
that should be available in models. The property will be populated accordingly
by the model's datasource.
2011-11-25 22:29:23 +07:00
Rachman Chavik
408e785d5e
Display datasource name in exceptions and error page.
...
When working with multiple databases, it's helpful to display
the datasource name that is requested by a given model.
2011-11-17 11:24:45 +07:00
mark_story
15753ab641
Apply patch from 'Carlos Gant'
...
Remove un-necessary loop when deleting without cascade.
Fixes #2050
2011-11-05 16:16:13 -04:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
Jose Lorenzo Rodriguez
d1a530f53b
Fixing all @link annotations in model class
2011-10-15 12:34:31 -04:30
Gonçalo Marrafa
4adc042882
Fix association lazy-loading when used with ContainableBehavior
2011-10-14 17:53:37 -04:30
Thomas Ploch
d9cd69ac6e
Removed unnessecary call to array_merge() in Model::_deleteLinks(). Fixes #2075 .
2011-10-07 15:03:05 +02: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
mark_story
a853c0f93a
Fix another typo.
2011-10-05 22:03:18 -04:00
mark_story
c11c5c5719
Fix typo in doc block.
2011-10-05 22:02:15 -04:00
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
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
ADmad
97a975c6c4
Refactoring Model::invalidFields() a bit.
2011-09-12 05:10:34 +05:30
Juan Basso
f7f3515135
Fixed documentation to methods that use func_get_args().
2011-08-21 21:45:34 -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
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
ADmad
c3884f407f
Implemented feature to allow multiple counter caches per associated model.
2011-08-17 18:10:32 +05:30
ADmad
2b342d96d6
Optimizing various finds when deleting records and updating counter cache to avoid extra queries, unnecessary joins and callbacks triggering
2011-08-15 11:47:52 +05:30
Juan Basso
7581db2cf2
More API description/examples to relations variables.
2011-08-15 01:10:32 -04:00
Juan Basso
0fcf6f6a1d
Updating some sentenses.
2011-08-15 00:35:20 -04:00
Juan Basso
725e512839
Description to some attributes in Model.
2011-08-15 00:17:40 -04:00
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
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
2a50a1ea99
Included @var in API that was missing.
2011-07-31 17:05:20 -04:00
Juan Basso
fedadc091c
Included @throws in API that was missing.
2011-07-31 16:55:52 -04:00
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
Juan Basso
39b4032820
Fixed some API doc in model.
2011-07-30 18:38:57 -04:00
Jose Lorenzo Rodriguez
8c60e01235
Reverting change done to validation that was duplicating the validates() process for the main model, returning the correct value in validateAssociated() instead
2011-07-26 10:05:16 -04:30
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
1c7f181b9f
Making saveAll with validate => only validate the current model data first
2011-07-25 23:23:26 -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
108505a6a0
Merge branch '2.0-form-helper' into 2.0
2011-07-16 17:32:07 -04:30
Jose Lorenzo Rodriguez
ef5650c034
Fixing ClassRegistry that was incorrectly checking class inheritance
...
Fixing Model class that was incorrectly sending model names to be instantiated
Fixing more FormHelper tests
2011-07-14 01:30:52 -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
Ceeram
00dd1ccc96
removing unneeded parameter, describe() only takes one parameter
2011-07-11 21:07:44 +02:00
Leonid Mamchenkov
b6ff3a6fdf
Fixed typo in the comment
2011-07-07 15:14:06 +03:00
Jose Lorenzo Rodriguez
765164f33b
Merge branch '2.0-extract-model-validation' into 2.0
2011-07-07 01:05:39 -04:30
ADmad
b22e30c5a3
Removing unneeded magic methods. Closes #1802
2011-06-28 17:28:36 +05:30
Jose Lorenzo Rodriguez
e758b272bd
Fixing problems when running the AllTests testsuite
2011-06-20 01:34:25 -04:30
Jose Lorenzo Rodriguez
33c74b6062
Implementing validation domain extraction in the ExtractionTask
2011-06-20 00:36:31 -04:30
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
ADmad
4c042ae133
Adding proper visibility keywords for class functions
2011-05-29 03:31:34 +05:30
ADmad
3844966714
Changed default value for key 'last' in validator options to true. Also implemented ability to list messages for all failed validations for a field at once, instead of current display of just one message at a time.
2011-04-18 02:08:48 +05:30
ADmad
d83712ce43
Renaming Model::$_findMethods to Model::$findMethods and changing visibility to public. Closes #1328
2011-04-17 06:09:00 +05:30
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
268c061a2e
t
...
dividing language domains
cake - end user
cake_error - error messages
cake_developer - not an error, just for the developer
2011-03-19 18:16:12 +01:00
AD7six
38180e8951
translation changes in the model dir
2011-03-12 20:01:12 +01:00
Jose Lorenzo Rodriguez
ba694c45c9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-02-27 22:50:53 -04:30
José Lorenzo Rodríguez
6e4f4efb79
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
lib/Cake/Console/Command/TestSuiteShell.php
lib/Cake/Console/TaskCollection.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Controller/Controller.php
lib/Cake/Core/App.php
lib/Cake/Model/BehaviorCollection.php
lib/Cake/Network/CakeRequest.php
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
lib/Cake/TestSuite/CakeWebTestCase.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/TestSuite/TestRunner.php
lib/Cake/View/HelperCollection.php
lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
lib/Cake/tests/cases/libs/test_manager.test.php
2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
b5122e6e81
Fixing more console classes
2010-12-07 01:44:47 -04:30
José Lorenzo Rodríguez
3f64844de9
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
8678661b9c
Merge branch 'feature/2.0/pdo' into 2.0-class-loading
2010-12-04 11:21:54 -04:30
José Lorenzo Rodríguez
fa83ecda5b
Beginnings of model loading
2010-12-04 02:57:20 -04:30
