ADmad
0b4ba0b049
Fix api docblocks for behaviors.
2014-06-10 00:38:44 +05:30
mark_story
146053c980
Update datasource API docs.
2014-06-06 14:06:32 -04:00
ADmad
1d40f3e685
Fix API docblock CS errors.
2014-06-05 00:28:55 +05:30
ADmad
e7debd8692
More API docblock CS fixes.
2014-06-02 18:27:11 +05:30
Stefan Dickmann
91907b5c6c
correct docblock
...
invalid certificate domain
2014-06-01 13:23:47 +02:00
ADmad
3d9b2b80cb
More API docblock fixes.
2014-06-01 03:06:05 +05:30
mark_story
81875cfeb1
Optimize renew().
...
Don't call session_id() twice when we can use a local variable to store
the current session id.
Fixes #3531
2014-05-22 14:28:56 -04:00
Kenshin Okinaka
91cb3ddc27
Unset $db in DboSource::read().
...
After calling $db->queryAssociatin(), it is necessary to unset db.
This reverts commit 52d425737a
.
2014-05-13 21:17:34 +09:00
mark_story
89cd114e6f
Merge branch 'master' into 2.5
2014-05-12 14:30:02 -04:00
Stephen Cuppett
ed83df5bed
Fixes #3469 , explicit isset check for counterCache
2014-05-11 19:17:18 -04:00
Walther Lalk
2dd3cecfaa
Fixes issue with Sql Server driver when loading fixtures
...
Sqlserver::describe is expecting a model object (Unlike other drivers which work with either a object or string). While this does work under normal conditions, it causes a "Trying to get property of non-object" notice when using fixtures. The same problem also causes the testLimitOffsetHack test to fail.
This change does a simple test to ensure that the $model variable is an object before trying to access a property of it. All SqlServer tests are now passing.
2014-05-06 12:43:36 +02:00
ADmad
d466e00644
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
lib/Cake/Utility/Folder.php
lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
7a287a6942
More coding standard corrections.
2014-04-29 14:19:33 +02:00
mark_story
de0062de77
Merge branch 'master' into 2.5
2014-04-25 22:10:02 -04:00
mark_story
9d19801cfa
Clear data and validationErrors *after* calling clearCache().
...
Having both properties cleaned after clearCache() means that you can use
the model data in specialized clearCache() implementations.
Fixes #3386
2014-04-24 09:19:00 -04:00
mark_story
d54fbe6f60
Merge branch 'master' into 2.5
2014-04-18 22:13:56 -04:00
Mark Story
d2fa1b444f
Merge pull request #3301 from ubermaniac/Sqlserver-trim
...
Trim $sql before checking for SELECT
2014-04-11 18:48:41 -04:00
Joseph Woodruff
9aeea2fcc3
Trim $sql before checking for SELECT
2014-04-11 15:25:07 -06:00
mark_story
bf9c3029cb
Merge branch 'master' into 2.5
2014-04-10 20:51:49 -04:00
euromark
8e0f15b3d6
Revert the removal of a BC relevant part.
2014-04-10 20:11:58 +02:00
euromark
0ece694a75
microptimize options and default merge and other string key array merges
2014-04-08 01:25:14 +02:00
euromark
cb0ac6f9f3
Add a note to offsetSet() on why it cannot chain.
2014-04-06 22:59:18 +02:00
Joseph Woodruff
8536371501
Sqlserver Datasource how properly appends the schemaName prefix in the describe() method
2014-04-02 13:59:04 -06:00
Joseph Woodruff
d526fdadc1
Base model class no longer changes an already defined schemaName value
2014-04-02 13:58:29 -06:00
mark_story
2fe8c4050b
Insert manual joins *after* generated joins.
...
Re-order query joins to make manually added joins be performed after
generated joins. This removes the need to workaround the current join
order, or redefine all association joins when you want to add an
additional join on a leaf table.
Refs #2179
Refs #2346
2014-03-23 21:09:08 -04:00
mark_story
8acb75425d
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Datasource/DboSource.php
2014-03-21 22:55:28 -04:00
James Watts
2eadb89ff6
Update in_array() check to avoid fatal error
...
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
2014-03-21 16:16:32 +01:00
ADmad
961f9d7669
Merge branch 'master' into 2.5
2014-03-16 20:17:24 +05:30
Wouter van Dongen
5035613157
* Fixed bug where select query in deleteAll could return wrong table name.
...
PDOStatement::getColumnMeta (in mysql.php) sometimes returns the actual
table name when using a MySQL view with the distinct select query, and not
the alias table name. By returning the actual table name the records
could not be removed.
By the way PDOStatement::getColumnMeta is an experimental function,
perhaps it's better to avoid it.
2014-03-14 15:20:12 +01:00
mark_story
3a226b03c3
Remove typehint from generateAssociationQuery()
...
While I think typehints are generally a good idea, this one broke a few
plugins, notably CakeDC/search. I don't think it is wise for 2.X release
to break BC in that way. I think reverting this change is probably the
safest path right now.
2014-03-12 23:42:21 -04:00
mark_story
5a944734b8
Remove typehint on $LinkModel argument.
...
Adding a typehint here causes errors in a few userland plugins. We
should honor the previous interface as best we can.
2014-03-12 23:30:46 -04:00
Mark Story
fda242f000
Merge pull request #2961 from ovidiupruteanu/patch-3
...
Sqlserver->describe failing for models with a schemaName
2014-03-11 21:03:54 -04:00
mark_story
c5b6dda82f
Merge branch 'master' into 2.5
2014-03-11 21:02:27 -04:00
Thomas Smith
4927cf6901
#2994 , unnecessary calls to Model::__isset(null)
2014-03-10 10:16:32 -07:00
ovidiupruteanu
7b1086e632
Add missing spaces
2014-03-06 05:18:31 +02:00
ovidiupruteanu
56a3f093a1
Sqlserver->describe failing for models with a schemaName
...
When models have a schemaName set it was searching for TABLE_NAME = 'schema_name.table_name'.
Instead it should search for TABLE_NAME = 'table_name' AND TABLE_SCHEMA = 'schema_name'
2014-03-06 04:54:03 +02:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
mark_story
96a37d5917
Fix temporary associations that replace fields not being restored.
...
When binding temporary associations, fields should be restored
in the afterFind as the association will have become unbound.
Fixes #2816
2014-02-11 21:56:05 -05:00
mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
ADmad
9de3418079
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
Eric Martins
2793dca671
Fix ApiGen errors
2014-02-07 18:29:54 -02:00
Jimmy Madon
fcd41e45a7
Clarified ACL node lookup failed error.
...
Original error was ambiguous in stating whether the ARO node lookup failed or the ACO node lookup failed.
2014-02-05 18:25:14 +00:00
mark_story
be8ebfc005
Merge branch 'master' into 2.5
2014-02-05 09:22:46 -05:00
José Lorenzo Rodríguez
e36c954da7
Merge pull request #2693 from ADmad/2.5-session-start
...
Don't start a session if it's known to be empty.
2014-02-01 04:08:48 -08:00
Rachman Chavik
59549b7ebe
Fix: Changing boolean to integer for Postgres
...
Closes #2751 , CakeDC/migrations#149
2014-01-31 15:14:20 +07:00
mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
joostdekeijzer
987187ef8c
Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::field('fieldname') and Model::read('fieldname')
2014-01-29 13:37:47 +01:00
Rachman Chavik
b83b59a9d7
Log errors instead of calling trigger_error()
2014-01-29 17:51:07 +07:00
ADmad
c093804b35
Merge branch 'master' into 2.5
2014-01-26 17:39:50 +05:30
mark_story
d7d8fc00d1
Check data with isset() before accessing it.
...
Don't blindly access data that may not exist.
Fixes #2712
2014-01-25 22:15:47 -05:00