mark_story
b9f0fc0724
Merge branch '1.3' into merger
...
Conflicts:
cake/dispatcher.php
cake/libs/cake_session.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/set.php
cake/libs/validation.php
cake/libs/view/view.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
mark_story
c096eea664
Fixing failing tests caused by constants changing.
2010-12-05 23:32:34 -05:00
José Lorenzo Rodríguez
c559b9c22d
Merge remote branch 'origin/2.0' into 2.0
...
Conflicts:
cake/console/templates/skel/config/database.php.default
cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
Juan Basso
c52d5320c8
Replaced the *printf with i18n aliases by i18n aliases with params.
2010-12-04 23:37:13 -02:00
mark_story
8031d33d33
Fixing more E_STRICT notices and adding a type check to DboSource::dropSchema().
2010-12-04 14:37:02 -05:00
mark_story
a6c5065e9c
Fixing a few more E_STRICT errors in postgres test/class.
2010-12-04 14:31:11 -05:00
mark_story
7e3c98024e
Removing reference operators in ModelBehavior.
2010-12-04 14:19:36 -05:00
mark_story
18fb12c95c
Removing & pass by ref operators as they aren't needed any more.
...
Fixing a bunch of E_STRICT errors.
2010-12-04 14:15:32 -05:00
mark_story
d13759522b
Removing strtolower() calls. You must now call model magic findBy and findAllBy using camelcase forms.
2010-12-04 13:45:42 -05:00
mark_story
466137485d
Removing a duplicated property.
...
Changing is_a() to instanceof as it marginally faster.
Adding a comment to getConnection as it was missing it.
Minor optimization to a regular expression.
2010-12-04 13:28:43 -05:00
José Lorenzo Rodríguez
66d0986cd4
Pepending table name to index generation to avoid name clashes
...
Finally, all tests using a Sqlite database pass
2010-12-03 15:25:26 -04:30
José Lorenzo Rodríguez
e167271568
Making more DboSlite tests pass
2010-12-03 14:41:39 -04:30
José Lorenzo Rodríguez
7c4ab886e6
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-12-03 14:08:03 -04:30
José Lorenzo Rodríguez
cdc4cb9e1e
Implementing method in DboSqlite to avoid error while running the test suite
2010-12-02 00:20:08 -04:30
José Lorenzo Rodríguez
2e04c5260e
Fixing some tests to make them run on sqlite
2010-12-02 00:19:43 -04:30
José Lorenzo Rodríguez
2e9283abd9
Fixing fixture loading for sqlite
2010-11-29 20:52:54 -04:30
José Lorenzo Rodríguez
0d93520e0a
Fixing test case for sqlite
2010-11-29 20:52:32 -04:30
José Lorenzo Rodríguez
a791687784
Adding try catch for pdo exception on DboSource::_execute
2010-11-28 23:50:18 -04:30
José Lorenzo Rodríguez
372123f15a
Moving common method put from DboMysl into DboSource, this makes more sqlite tests pass
2010-11-28 22:45:56 -04:30
José Lorenzo Rodríguez
492bcea85f
mproving decribing process of tables in sqlite
2010-11-27 00:37:13 -04:30
José Lorenzo Rodríguez
0ff01330c4
Making dates deconstruction in model more consistent for different datasources
2010-11-27 00:13:04 -04:30
José Lorenzo Rodríguez
41ee035d28
Starting to bring sqlite dbo up to date
2010-11-26 23:46:34 -04:30
José Lorenzo Rodríguez
b6731dd9ad
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
2010-11-26 20:26:41 -04:30
mark_story
845edf38e1
Removing core classes using App::import() with an array(). This usage incurs an additional call to App::import().
...
Removing Set from core class imports, as Set is required as part of the framework bootstrapping.
2010-11-25 22:51:30 -05:00
mark_story
15ca2400bc
Fixing issue in DboSource::name() where special characters in column names would not be correctly quoted.
...
Tests added.
Fixes #1264
2010-11-25 06:52:23 -05:00
mark_story
bf10723f89
Applying patch from 'michealc' to fix duplicated comments. Fixes #1306
2010-11-22 21:21:55 -05:00
mark_story
8aabf3689e
Making BehaviorCollection more consistent with other object collections.
...
Fixing failing tests caused by not being updated when behavior changed.
2010-11-21 14:42:13 -05:00
mark_story
8821bec049
Moving _mergeVars() into Object as its common to Controller, Model and Shell.
2010-11-21 00:14:29 -05:00
mark_story
e2aeae3825
Adding _mergeVars() into Model.
...
Refactoring how Model does its property merging.
Eventually _mergeVars() could be moved into Object.
2010-11-21 00:12:07 -05:00
José Lorenzo Rodríguez
40418de218
Freeing up some memory in dbos after the result set has been completly fetched.
...
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
José Lorenzo Rodríguez
c0f10437ea
Adding a few transactions to speed up a little tests involving fixtures
2010-11-16 23:14:48 -04:30
José Lorenzo Rodríguez
1326707c9d
Implementing transaction nesting, this will allow to open multiple transactions that will only be commited if all transactions succesfully calls commit()
2010-11-16 22:56:23 -04:30
mark_story
d12c232d8a
Merge branch '1.3' into merger
...
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
José Lorenzo Rodríguez
f2b707ac0b
Merge remote branch 'origin/2.0' into feature/2.0/pdo
...
Conflicts:
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
2010-11-16 21:54:42 -04:30
José Lorenzo Rodríguez
a335891eba
mapping lastNumRows to lastAffectedRows as it is not possible to do the first one using PDO
2010-11-16 02:02:08 -04:30
mark_story
9b08b725fe
Merge branch '2.0' into 2.0-view
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/view/helpers/cache.php
2010-11-13 21:03:54 -05:00
mark_story
18bb5f6b8b
Removing =& operators for construction of objects.
2010-11-12 23:05:44 -05:00
mark_story
6c2b088706
Merge branch '2.0' into 2.0-view
2010-11-10 23:41:44 -05:00
José Lorenzo Rodríguez
00a3eda4d0
Fixing broken test because of change done in previous commit
2010-11-10 23:48:58 -04:30
José Lorenzo Rodríguez
47c6132b24
cleaning up some tests, adding missing parameters in DboSource to match declaration on DataSource
2010-11-09 01:25:05 -04:30
José Lorenzo Rodríguez
9caba98780
Merge branch '2.0' of github.com:cakephp/cakephp into feature/2.0/pdo
2010-11-08 22:40:09 -04:30
José Lorenzo Rodríguez
afa5ee6885
Removing E_STRICT errors from connection manager
2010-11-08 22:37:34 -04:30
mark_story
e8678b38ac
Adding specific conditions to model->delete's call to dbo->delete. This
...
helps fix a race condition where dbo->defaultConditions could cause
additional data loss. Fixes #250
2010-11-08 21:50:45 -05:00
mark_story
3216c902cd
Removing the enable parameter on HelperCollection, BehaviorCollection, and ComponentCollection. They all now support the enabled option that Behaviors have historically supported. This provides a simpler API with fewer arguments, and allows callbacks to be disabled on objects in their declared arrays.
...
Test cases updated.
2010-11-07 13:23:45 -05:00
mark_story
88c717dbd8
Removing the 3rd param from ObjectCollection::load() and adding a uniform setting of 'callbacks'. This setting is used to disable callbacks on objects by convention. Test cases updated.
2010-11-07 13:23:45 -05:00
ADmad
eb76ab95f2
Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself.
2010-11-06 09:33:50 +05:30
José Lorenzo Rodríguez
6028705c72
Moving more methods out from DboSourceTest
2010-11-03 19:52:49 -04:30
José Lorenzo Rodríguez
eedd823fd8
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-11-03 00:23:18 -04:30
Mark Story
e6aeae8935
Fixing issue where value in difference array was always the string value instead of the original value.
2010-10-31 22:44:45 -04:00
Mark Story
a3da915abd
Fixing issue where value in difference array was always the string value instead of the original value.
2010-10-31 22:41:33 -04:00
