mark_story
|
3e17fee237
|
Fix error created in merge with 1.3
|
2011-10-16 18:58:59 -04:00 |
|
Jose Lorenzo Rodriguez
|
7c5352a6c2
|
Merge branch 'master' into 2.0
Conflicts:
cake/libs/controller/components/request_handler.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
cake/tests/cases/libs/view/view.test.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/cake
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/VERSION.txt
|
2011-10-16 17:56:22 -04:30 |
|
Renan Gonçalves
|
573a349209
|
Using plugin name on exception thrown and in templates files.
|
2011-10-16 13:40:36 +02:00 |
|
Renan Gonçalves
|
229bf8e984
|
Keeping BC on short syntax for Acl and Tree behavior.
|
2011-10-16 12:06:41 +02:00 |
|
Renan Gonçalves
|
3a04bb4733
|
Dropping short syntax support for Behavior configuration.
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
|
2011-10-15 20:52:41 +02:00 |
|
Renan Gonçalves
|
1cf67b1e55
|
Little cleanup in exceptions.
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
|
2011-10-15 20:08:02 +02:00 |
|
Jose Lorenzo Rodriguez
|
d1a530f53b
|
Fixing all @link annotations in model class
|
2011-10-15 12:34:31 -04:30 |
|
Jose Lorenzo Rodriguez
|
d406889b14
|
changing @link in containable behavior
|
2011-10-15 11:47:10 -04:30 |
|
Jose Lorenzo Rodriguez
|
91d0a081fb
|
Fixing more links in doc blocks
|
2011-10-15 11:38:49 -04:30 |
|
mark_story
|
6d9b709c7a
|
Fix method signatures of database drivers.
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.
Fixes #2100
|
2011-10-14 21:25:14 -04:00 |
|
Gonçalo Marrafa
|
4adc042882
|
Fix association lazy-loading when used with ContainableBehavior
|
2011-10-14 17:53:37 -04:30 |
|
Majna
|
a5220fa7bb
|
Fixed doc block comments.
|
2011-10-11 00:22:23 +02:00 |
|
mark_story
|
455787ade9
|
Fixing undefined variable reference.
Fixes #2078
|
2011-10-09 22:34:59 -04:00 |
|
Thomas Ploch
|
d9cd69ac6e
|
Removed unnessecary call to array_merge() in Model::_deleteLinks(). Fixes #2075 .
|
2011-10-07 15:03:05 +02:00 |
|
Jose Lorenzo Rodriguez
|
c56797a15f
|
Adding destructor in CacheSession handler to avoid a fatal error when closing the session
|
2011-10-06 23:10:13 -04:30 |
|
Jose Lorenzo Rodriguez
|
a14abd6281
|
Fixing DatabaseSession handler to correctly close the session before the model object is destroyed by php.
This allows to remove an old hack in ConnectionManager
|
2011-10-06 23:01:49 -04:30 |
|
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
|
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 |
|
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
|
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
|
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 |
|
Jose Lorenzo Rodriguez
|
705593908b
|
Fixing some @package declarations
|
2011-09-30 13:17:12 -04:30 |
|
mark_story
|
a3f25ee5e3
|
Fixing issue with integer columns and NULL values.
Fixes #2037
|
2011-09-29 20:28:52 -04:00 |
|
Jose Lorenzo Rodriguez
|
6b7c752478
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-09-28 21:23:43 -04:30 |
|
Jose Lorenzo Rodriguez
|
df2ef0e4f1
|
Bringing the SQlserver datasource up to date, fixing a doc block
|
2011-09-28 21:23:06 -04:30 |
|
Majna
|
681207e327
|
Fixed doc block comments.
|
2011-09-28 22:33:46 +02: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
|
6008e0e8a0
|
Adding quoting around SET NAMES.
Fixes #2028
|
2011-09-26 21:46:16 -04: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 |
|
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 |
|
ADmad
|
7c87e9abc1
|
For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994
|
2011-09-16 13:40:04 +05:30 |
|
ADmad
|
97a975c6c4
|
Refactoring Model::invalidFields() a bit.
|
2011-09-12 05:10:34 +05:30 |
|
Jose Lorenzo Rodriguez
|
3d0af8b690
|
Adding a new exception renderer method to show useful error for failed queries
|
2011-09-04 04:50:19 -04:30 |
|
mark_story
|
2c21fc90fb
|
Fixing failing tests and issues with Sqlite.
|
2011-09-03 22:07:45 +01:00 |
|
Jose Lorenzo Rodriguez
|
d24c408537
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-09-03 14:31:02 -04:30 |
|
mark_story
|
4172eac7c6
|
Removing trigger_warning() that causes tests to fail in Sqlite, as
it does not assign lengths for integer columns.
|
2011-09-03 18:59:23 +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 |
|
mark_story
|
cc8d44f21f
|
Adding an exception for when a PDO interface is not installed.
|
2011-09-03 17:03:31 +01:00 |
|
Jose Lorenzo Rodriguez
|
783b5d4d1c
|
Fixing fatal errors when running postgres
|
2011-09-03 11:27:58 -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 mark@mark-story.com
|
8ce6c31708
|
Adding extra information about DboSource::fetchAll() and result caching.
|
2011-08-31 22:52:33 +01:00 |
|
Juan Basso
|
f7f3515135
|
Fixed documentation to methods that use func_get_args().
|
2011-08-21 21:45:34 -04: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 |
|