Mark Story
08e7bcb7ab
Merge branch '1.3' into integration
...
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
mark_story
f5fd069583
Applying patch from 'Justas Butkus' to fix CakeSchema::compare()
...
Fixes issues with comparing null == '' and adds a new protected method to handle null aware array difference generation.
Tests added.
Fixes #1206
2010-10-27 23:03:31 -04:00
José Lorenzo Rodríguez
b3d8a619a3
Updating test for booleans in postgres
2010-10-26 21:46:29 -04:30
José Lorenzo Rodríguez
ce490b1df2
Fixing issues with translatable field aliasing in TranslateBehavior
2010-10-26 18:22:13 -04:30
José Lorenzo Rodríguez
9f27fa7dfb
Fixing parsing of translated data after switching to virtualFields
2010-10-26 17:52:40 -04:30
José Lorenzo Rodríguez
02635696d7
Removing function from created virtual fields in translate behavior as it was not needed
2010-10-26 17:51:29 -04:30
José Lorenzo Rodríguez
90274ef859
restoring commented code to make more tests pass
2010-10-26 17:50:37 -04:30
José Lorenzo Rodríguez
e989f71b99
making a backup of model virtual fields in traslate behavrio to avoid side effects
2010-10-26 17:49:43 -04:30
José Lorenzo Rodríguez
f94f79e146
Initial steps to start using virtual fields in TranslateBehavior, this will ease Dbo abstraction
2010-10-25 23:40:24 -04:30
José Lorenzo Rodríguez
25c213e976
Preventing zero length of fields using prostgres
2010-10-25 20:25:07 -04:30
José Lorenzo Rodríguez
a6b6720717
Fixing bug in boolean conversion for postgres
2010-10-25 19:46:23 -04:30
José Lorenzo Rodríguez
49ed8ede8e
Trucating tables in postgres now correctly resets the associated sequences
2010-10-25 19:45:46 -04:30
José Lorenzo Rodríguez
f00f4eae0f
Implementing getClientEncoding using postgres
2010-10-24 20:02:11 -04:30
José Lorenzo Rodríguez
2ec9a49f17
Resolving yet more problems with booleans in postgres
2010-10-24 20:01:33 -04:30
José Lorenzo Rodríguez
1acb619e75
Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC
2010-10-24 19:59:54 -04:30
José Lorenzo Rodríguez
34813ab35c
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-10-24 19:55:02 -04:30
José Lorenzo Rodríguez
139702e91c
Moving methods from Dbo's to the parent class as PDO already abstract what they do
2010-10-21 20:48:26 -04:30
José Lorenzo Rodríguez
c7763b316e
Fixing some boolean issues in DboPostgres
2010-10-21 20:34:11 -04:30
José Lorenzo Rodríguez
88289f071e
Restarting sequences by default qhen calling DboSource::truncate(), removing option to drop the sequence as it does not match behavior from other dbos
2010-10-21 00:21:10 -04:30
José Lorenzo Rodríguez
2262844346
Implementing set encoding in DboPostgres
2010-10-21 00:01:36 -04:30
José Lorenzo Rodríguez
ba1eb62678
Calling right method in DboPostgres::trucante
2010-10-20 23:59:44 -04:30
José Lorenzo Rodríguez
0ffe6de9e4
Allowing multiple sql sentences to be executed only for creting or altering databases
2010-10-20 23:57:00 -04:30
José Lorenzo Rodríguez
09487f830c
Preventing false positive in queries returning fields but havinf Count(*) inside them in DboPostgres
2010-10-20 23:29:07 -04:30
mark_story
7c296211ef
Making generating schema for connections with prefixes work correctly. The prefix needs to be removed so that when tables are created or updated they do not get the prefix added twice.
...
Moving tests around. Fixes #1180
2010-10-20 23:17:04 -04:00
mark_story
498417203b
Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
...
Test added.
Fixes #1211
2010-10-20 22:28:31 -04:00
José Lorenzo Rodríguez
d0fc2fd171
Fixing describing of table columns for postgres
2010-10-19 00:48:08 -04:30
José Lorenzo Rodríguez
3f0c79f7f9
Fixing some problems in in DboPostgres::connect()
2010-10-19 00:15:32 -04:30
José Lorenzo Rodríguez
edd448f0b8
Implementing resultSet and fetchResult in DboPostgres
2010-10-18 00:38:48 -04:30
José Lorenzo Rodríguez
ad22bc31c7
Updating DboPosgres::describe() to use PDO
2010-10-18 00:23:19 -04:30
José Lorenzo Rodríguez
c1ca039582
Fixing typo in listSources
2010-10-18 00:11:24 -04:30
José Lorenzo Rodríguez
ab9c8904ad
Implementing lastInsertId for postgres
2010-10-18 00:08:58 -04:30
José Lorenzo Rodríguez
5c87daf083
Implementing listSources for postgres
2010-10-18 00:08:34 -04:30
José Lorenzo Rodríguez
aedf69dee1
More refactoring to DboSource::value()
2010-10-17 23:55:11 -04:30
José Lorenzo Rodríguez
16463229e5
Fixing return value of DboSource::boolean()
2010-10-17 23:40:51 -04:30
José Lorenzo Rodríguez
d9c9a32ff3
Refactoring DboSource::value() so postgres and mysq behavior is the same, updating test case
2010-10-17 23:38:55 -04:30
José Lorenzo Rodríguez
159776fc00
Refactoring possible common code to DboSource, now that PDO abstract disconnection from source
2010-10-17 23:37:56 -04:30
José Lorenzo Rodríguez
f3d3ee92f2
Implementing basic connection to postgres using PDO
2010-10-17 23:36:34 -04:30
Juan Basso
d771239104
Fixed support to save XML data in Models.
2010-10-17 22:47:43 -02:00
José Lorenzo Rodríguez
28685dc234
More replacements of assignation by reference
2010-10-17 19:20:21 -04:30
José Lorenzo Rodríguez
122cb1ec5b
Removing mor assignments by reference
2010-10-17 18:58:03 -04:30
José Lorenzo Rodríguez
bcc1417e5d
Making database stats dependent of fullDebug
...
Leaving lastNumRows commented out until some bugs are solved
2010-10-17 18:36:35 -04:30
José Lorenzo Rodríguez
10646ba2ad
Removing duplicate assignation of same object that didn't make much sense
2010-10-17 16:17:53 -04:30
José Lorenzo Rodríguez
cbdfb3f76e
Removing all references to mysqli
2010-10-17 11:49:17 -04:30
José Lorenzo Rodríguez
c016f1d97b
Impriving documentation
2010-10-17 11:28:11 -04:30
José Lorenzo Rodríguez
7e2fe43ee3
FIxing query caching to take in account bound parameters
2010-10-17 10:51:54 -04:30
José Lorenzo Rodríguez
097191213b
Removing use of third parameter of fetchAll()
2010-10-17 10:32:02 -04:30
José Lorenzo Rodríguez
65a641af23
Improving fetchAll method to accept an array of aprameters to be bound to the query, so now it is possible to use proper prepared statements
2010-10-17 10:29:01 -04:30
José Lorenzo Rodríguez
642bfe3576
Fixing some problem on fetching result data with multiple columns with same name
2010-10-17 10:15:40 -04:30
José Lorenzo Rodríguez
082873721c
Changing param order in execute() to maintain compatibility, making all tests pass
2010-10-16 20:28:07 -04:30
José Lorenzo Rodríguez
25915bd931
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-10-16 14:20:58 -04:30
José Lorenzo Rodríguez
d83c95cf46
Fixing bug in DboMysql::value()
2010-10-16 14:01:01 -04:30
José Lorenzo Rodríguez
88a2fb5058
Fixing bug in DboMysql::describe()
2010-10-16 13:44:16 -04:30
José Lorenzo Rodríguez
84283ed6f3
Fixing DboMysql::listDetailedSources()
2010-10-16 13:28:18 -04:30
José Lorenzo Rodríguez
e03cbcb167
Fixing model describing and making pass testBlobSaving
2010-10-16 10:23:13 -04:30
José Lorenzo Rodríguez
cb16605805
Fetching result rows PDO style
2010-10-16 10:22:50 -04:30
José Lorenzo Rodríguez
f772527445
Using PDO method to get lastInsertId
2010-10-16 09:34:29 -04:30
José Lorenzo Rodríguez
a5f3f95e3a
Simplifying DboMysql::getCharsetName()
2010-10-16 09:32:01 -04:30
José Lorenzo Rodríguez
21f5707be7
Implementing disconnection in DboMysql
2010-10-15 19:17:52 -04:30
José Lorenzo Rodríguez
7a7659d063
Removing DboMysqlBase as the inner driver selection will be delegated to PDO, extracting _execute() and adding it to DboSource
2010-10-15 19:01:28 -04:30
José Lorenzo Rodríguez
5e80cf8ff7
Improving DboMysql::index()
2010-10-15 17:27:36 -04:30
José Lorenzo Rodríguez
c54448d205
Initial steps toward getting complete query results in DboMysql using PDO
2010-10-15 17:05:30 -04:30
José Lorenzo Rodríguez
bd856c7ef9
Fixing value quoting in DboMysql
2010-10-15 17:04:49 -04:30
José Lorenzo Rodríguez
0fb2ac0285
Chaging implementation of DboMysql::getVersion(), improving connection options
2010-10-15 17:03:59 -04:30
José Lorenzo Rodríguez
70ed9a7b12
Fixing DboMysql::index() method
2010-10-15 17:02:37 -04:30
José Lorenzo Rodríguez
52ea8fb42e
Fixing mysql connection string
2010-10-15 16:07:51 -04:30
José Lorenzo Rodríguez
52023085f4
Using the PDO conenction inside DboMysql::getCharsetName()
2010-10-14 23:32:07 -04:30
José Lorenzo Rodríguez
09e06d52b9
Implementing DboMysql::getVersion()
2010-10-14 23:15:17 -04:30
José Lorenzo Rodríguez
b8479459d6
Inital work for connecting to mysql using PDO and gettng the table list, testing is easier as it now uses mocks
2010-10-14 01:10:51 -04:30
José Lorenzo Rodríguez
efbefeb71a
Stating migration to PDO, a driver is available if listed as available by PDO
2010-10-13 22:40:45 -04:30
mark_story
f19e3d501c
Merge branch '1.3' into integration
...
Conflicts:
cake/libs/model/cake_schema.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/model.php
cake/libs/view/helpers/form.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
d56416456c
Applying patch from 'Justas Butkus' to DboSource
...
Fixes issues where reconnect could issue warnings related to
array_merge. Fixes #1182
2010-10-11 21:52:10 -04:00
mark_story
f847080cbf
Changing more php version strings.
2010-10-03 12:46:03 -04:00
mark_story
5e26d282a1
Fixing connection specific schema generation
...
Fixing missing table errors when reading schema for specific connections.
Tests updated to check that tables not on a connection are never touched. Fixes #1106
2010-09-30 23:22:57 -04:00
mark_story
c573fd0432
Fixing issue where a beforeDelete() could trigger a table truncation.
...
Moving the exists check below beforeDelete() and behavior->beforeDelete() so any records deleted in the callbacks will not exist when db->delete() is called. Test updated. Fixes #250
2010-09-29 23:31:41 -04:00
mark_story
b08aba8e86
Adding a missing rollback when validation on an associated record fails, and validate = first. Fixes #1147
2010-09-28 23:37:28 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
a4746c7227
Applying patch from 'kworr' to reorder the switch in DboPostgres::value() to fix issues with pgsql 9.0. Fixes #1139
2010-09-24 22:47:18 -04:00
mark_story
8cd266c77f
Correcting example in doc block. Fixes #1132
2010-09-24 22:23:24 -04:00
mark_story
729a45703b
Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121
2010-09-21 20:34:27 -04:00
mark_story
d113d7d612
Removing dead code from DboSource::fields()
...
Updating fields() to use implode, so complex virtual fields are better handled. Fixes #1079
2010-09-18 00:04:36 -04:00
mark_story
5a8648cca0
Fixing issue in DboSource::_matchRecords() where unqualified conditions would result in 1=1 conditions. Fixing incorrect test case. Fixes #930
2010-09-16 00:17:09 -04:00
mark_story
730e373afe
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/cake_session.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/fixtures/data_test_fixture.php
2010-09-12 13:35:46 -04:00
mark_story
e4d34b640b
Merge branch '2.0-exceptions' into 2.0
...
Conflicts:
cake/libs/error.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/error.test.php
2010-09-10 20:31:16 -04:00
Mark Story
e15069769d
Adding tests for #1079 and fixing some formatting.
2010-09-07 00:09:06 -04:00
Mark Story
d88da3d579
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
c60edfae6d
Fixing issue where errors containing code = 500, were not actually converted to error500 when debug = 0. Making missingConnection, and missingTable into error500 errors.
2010-09-06 16:46:41 -04:00
Mark Story
464d2217e6
Renaming model_behavior test to behavior_collection test as that's the class that contains the tested methods.
2010-09-06 13:51:42 -04:00
Mark Story
5789aaf24d
Applying patch from 'tkykmw'. Behavior mapped methods are no longer run through strtolower(). Mapped methods are now case sensitive. Fixes #318
2010-09-06 13:38:01 -04:00
Mark Story
d62ae2900a
Fixing issue where ConnectionManager wasn't triggering session close, causing issues with database sessions.
2010-09-06 01:10:45 -04:00
ADmad
bfaaa6b8ba
Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' associated models. Closes #995
2010-09-05 23:53:24 +05:30
mark_story
f1164c93d6
Updating the various CakeExceptions to take arrays in their constructors. This allows for the existing templates to continue working, as well as generalize the way in which errors are handled. This change also makes the messages coming out of exceptions more readable and removes string hackery.
2010-08-29 21:37:25 -04:00
mark_story
dc67b9cacc
Moving all the exceptions into one file for the short term.
2010-08-28 00:08:35 -04:00
mark_story
0683dc43ff
Replacing cakeError calls with exceptions in ConnectionManager and Model.
2010-08-27 23:54:22 -04:00
mark_story
b02e213958
Adding test case from '0x20h'. Fixing issue where atomic = false, validate = first and saveAll() saving many rows could return an incorrect value. Fixes #1050
2010-08-26 22:21:39 -04:00
mark_story
ea9e30890f
Adding a workaround to DboSource::showLog() to work around fix added in [ da9c0da626
].
...
Also adding explanation message when logs are not generated.
2010-08-26 21:24:09 -04:00
dogmatic69
95168cee6e
casting the find as an array to avoid errors with array_values() fixes #1041 and 4 failing tests (3 previous)
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-08-26 20:32:48 -04:00
mark_story
5446a062ee
Fixing issue where whitelist would not be used for validation. Test case added. Fixes #1037
2010-08-21 22:48:59 -04:00
mark_story
12d4b52f10
Fixing failing tests in DboMysql and DboPostgres related to localized floats. Refs #1029
2010-08-21 00:49:40 -04:00
mark_story
f46241a6e7
Merge branch '2.0' into 2.0-helpers
2010-08-16 23:02:44 -04:00
mark_story
c4a978d386
Adding changes missed in the merge.
2010-08-15 23:10:29 -04:00
mark_story
705e90bef7
Merge branch '1.3' into 2.0-merge
...
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
686b9c2c8b
Fixing issues in alterSchema in DboMysql and DboPostgres, where fields would be appended to each table being altered.
...
Also fixed an issue in DboPostgres where the generated alter statements would contain too many ;.
Test cases added. Fixes #1023
2010-08-15 22:17:02 -04:00
mark_story
c44c276fa3
Removing ModelBehavior::dispatchMethod(), replacing with call_user_func_array() as its faster and the php4 workaround is no longer needed.
2010-08-10 23:18:39 -04:00
mark_story
409b12954b
Simplifying logic and data structures used to store enabled-ness of objects in an object collection.
2010-08-10 23:18:39 -04:00
mark_story
b2250852e4
Moving BehaviorCollection into its own file.
...
Changing how behaviors are stored in the collection object. Makes it work the same as HelperCollection.
2010-08-10 23:18:39 -04:00
mark_story
c78e869be6
Removing PHP4 workarounds in BehaviorCollection.
...
Making BehaviorCollection throw exceptions instead of use cakeError.
2010-08-10 23:18:39 -04:00
mark_story
16d5b2655c
Adding a way to load helpers in a disabled state. Updating tests and subclasses.
2010-08-10 23:18:37 -04:00
mark_story
aa61a251dc
Deprecating BehaviorCollection::attach() and BehaviorCollection::detach(). load() and unload() are more generic and make sense in other contexts.
...
Adding base trigger implementation.
Adding tests for helper triggering.
2010-08-10 23:18:37 -04:00
mark_story
9fd881cb00
Moving methods down and adding some tests.
2010-08-10 23:18:36 -04:00
mark_story
6db3dbc680
Starting to create HelperCollection which will be responsible for loading and constructing helpers.
...
Making an abstract class that will be the base of all object collections.
Adding test cases.
2010-08-10 23:18:36 -04:00
mark_story
29ddffa2d3
Fixing regression in DboMysqlBase where describe() was no longer pulling out fieldParameters. A test case has been added to catch any future regressions. Fixes #991
2010-08-09 23:25:32 -04:00
Juan Basso
ae2fa908c5
Dont use private attributes as tables in CakeSchema. Fixes #7
2010-08-02 00:22:46 -03:00
mark_story
509a9e14e2
Fixing condition missing a model name in the TreeBehavior. Fixes #961
2010-07-31 14:29:00 -04:00
mark_story
2b1efafe65
Applying optimization from 'michaelc' to reduce number of strtolower() calls in AclBehavior. Fixes #972
2010-07-29 22:04:22 -04:00
mark_story
d81d33ffe6
Adding some additional documentation for Model::find(). Fixes #952
2010-07-27 21:25:31 -04:00
mark_story
d38857095a
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
ADmad
91b0a4ba4f
Changing Tree behavior's function names to be camel cased as per convention
2010-07-24 23:32:49 +05:30
Scott Reeves
b717abe1aa
Fixing typo in Constructor description.
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:15:00 -04:00
José Lorenzo Rodríguez Urdaneta
bc27d1eae4
Returning only booleans in Model::__isset() and removing return by reference in Model::getDataSource()
2010-07-15 23:17:13 -04:30
José Lorenzo Rodríguez Urdaneta
b8b4647355
Removing use of cakeError in Model and replacing it with an Exception
2010-07-15 23:11:30 -04:30
mark_story
4c27c24a72
Fixing issue in DboSource where COUNT() was hardcoded, omitting any other aggregate functions. Replaced with a regexp that accepts only letters. Test case added. Fixes #878
2010-07-15 23:17:38 -04:00
José Lorenzo Rodríguez Urdaneta
6fb930c73b
Removing assignments by reference in model class
2010-07-15 22:16:19 -04:30
José Lorenzo Rodríguez Urdaneta
a57e5e8c68
Replacing direct reads to schema cache and routing them to the correct method
2010-07-15 21:19:23 -04:30
José Lorenzo Rodríguez Urdaneta
5d1e6f9e4f
Fixing errors with displayField
2010-07-15 21:18:16 -04:30
José Lorenzo Rodríguez Urdaneta
a13be623b5
Making the model require database connection only wen needed or requested
2010-07-15 21:16:52 -04:30
José Lorenzo Rodríguez Urdaneta
e165f7d559
Changing how dynamic "with" models are loaded
...
Changing all calls to get model's datasourse to use Model::getDatasource()
2010-07-14 23:19:38 -04:30
José Lorenzo Rodríguez Urdaneta
c1a9a2e263
Correctly registering plugin models in CR, initial test case onmodel associations lazy loading
2010-07-14 19:23:41 -04:30
José Lorenzo Rodríguez Urdaneta
96f834a7ea
Various bugfixes in model associations lazy loafing for "with" associations
2010-07-14 17:54:19 -04:30
José Lorenzo Rodríguez Urdaneta
fdf91194a6
Initial approach for model associations lazy loading, all model tests passing
2010-07-14 16:58:12 -04:30
José Lorenzo Rodríguez Urdaneta
91c3cd8905
Refactoring Model::__createLinks to not loose the plugin name when creating the association
2010-07-13 23:28:48 -04:30
mark_story
65efd675c1
Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873
2010-07-11 13:06:33 -04:00
mark_story
3ae1501fd0
Removing more strtolower loops.
2010-07-09 23:58:48 -04:00
mark_story
cbccd16c46
Adding visibility and static keywords to connection manager.
2010-07-05 23:08:25 -04:00
mark_story
b8085cddce
Removing PHP5 and all its uses.
2010-07-05 22:19:22 -04:00
mark_story
02e25f7557
Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503
2010-07-05 21:50:36 -04:00
mark_story
4cd43553b4
Fixing issues where multiple reset bindModel() calls would cause incorrect associations to be restored.
...
Also fixing issues where multiple calls to unbindModel() would cause incorrect associations to be restored.
Tests added.
Fixes #889
2010-07-03 18:05:14 -04:00
mark_story
17a7a96ba2
Fixing issue where non-reset associations would get reset by resetAssociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868
2010-07-01 12:39:50 -04:00
mark_story
2020675078
Merge branch '1.3' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
e023350af5
Updating API docs related to DboSource::$cacheMethods. Fixes #870
2010-06-30 08:52:39 -04:00
mark_story
cd8dff362d
Merge branch '2.0-phpunit' into 2.0
...
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
929bb5769e
Merge branch '1.3' into 2.0
...
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
Juan Basso
2a4489cdf2
Naming conventions to datasources with plugins. Fixes #819
2010-06-20 23:53:54 -03:00
mark_story
df3432aa86
Updating doc blocks in ModelBehavior. Refs #810
2010-06-11 09:55:39 -04:00
mark_story
e5df32e9d9
Adding omitted documentation information.
2010-06-10 14:23:49 -04:00
mark_story
ec5ad93a68
Updating doc blocks for ModelBehavior so they better reflect the actual behaviour of the methods.
...
Removing unused variable assignment.
Fixes #810
2010-06-10 13:54:04 -04:00
José Lorenzo Rodríguez
f4cf945e30
Migrating DboSqliteTest to phpunit
2010-06-09 23:33:41 -04:30
mark_story
ad8b70cec2
Removing continue statement that did nothing.
...
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
José Lorenzo Rodríguez
bd7ce3804e
Migrating CakeSchemaTest to PHPUnit
2010-06-07 00:05:40 -04:30
José Lorenzo Rodríguez
fd4db4184a
Migrated ConnectionManager to phpunit
2010-06-04 23:47:38 -04:30
José Lorenzo Rodríguez
c23fe5d72e
Migrating ModelReadTest to PHPUnit
2010-06-04 23:07:29 -04:30