predominant
52cdef900b
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/tree.php
cake/libs/router.php
cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
José Lorenzo Rodríguez
7668894888
Fixing error introduced by previous commit
2010-04-07 09:51:29 -04:30
predominant
e4d292bfa4
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/libs/shell.php
cake/libs/controller/components/acl.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/security.php
cake/libs/controller/components/session.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/number.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/text.php
cake/libs/view/helpers/time.php
cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5
Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379
2010-04-05 21:50:28 -04:00
predominant
1497ec3910
Changed all public methods to specify public access.
2010-04-05 13:19:38 +10:00
José Lorenzo Rodríguez
45ccba5d94
Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524
2010-04-04 13:24:39 -04:30
predominant
3c2e7a091d
Changed access to private __associations on Model to associations() calls.
2010-04-04 18:17:43 +10:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
predominant
329a13fe5f
Changed all $_ declared variables to protected.
2010-04-04 16:36:12 +10:00
José Lorenzo Rodríguez
75900883e6
Making DboPostgres::value() return NULL when given an empty array, as DboMysql does
2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
bbf96567eb
Using value() in default value generation with CakeSchema and DboPostgres
2010-03-29 23:50:40 -04:30
Mark Story
068631ebe2
Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added.
2010-03-28 16:59:24 -04:00
ADmad
d365fafe4d
Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false
2010-03-28 05:29:42 +05:30
Mark Story
0c29fd0094
Merge remote branch 'origin/1.2' into 1.3
...
Conflicts:
cake/libs/cake_session.php
cake/libs/controller/components/session.php
cake/libs/model/model.php
cake/libs/router.php
2010-03-27 11:48:49 -04:00
José Lorenzo Rodríguez
41734503a6
Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
...
* '1.3' of git@github.com:cakephp/cakephp1x:
Supporting Model.* syntax on postgres.
Changing variable $title to $title_for_layout. Closes #511
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500
Qouting fields inside postgres functions when prepended a DISTINCT, closes #512
2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d
Supporting Model.* syntax on postgres.
2010-03-25 17:33:34 -03:00
ADmad
6a723bb515
Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477
2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
0f876e1a1b
Merge branch 'saveAll' into 1.3
...
* saveAll:
Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430
Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
28cb57a92c
Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
...
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3
Prevent sql error for uuids if id is specified as null
...
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
cceb568520
Skiping some test in model_write test when using postgres as there is no way yet to do joins inside an update statement.
...
Possible enhancement would be transforming the join conditions into subquerys
2010-03-16 18:46:04 -04:30
José Lorenzo Rodríguez
c51f4076f7
Forcing order on find('all') in test. It is not safe to asume returned row order in postgres
2010-03-16 17:00:20 -04:30
José Lorenzo Rodríguez
201a952218
Fixing test for postgresql, it is no safe to asume the order of the returned results of a joined table
2010-03-16 15:12:27 -04:30
AD7six
0c951b7248
Prevent sql error for uuids if id is specified as null
...
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
661fcd32ab
Fixing failing tests in PostgreSQL cause by invalid datatype comparisons and missing id fields.
2010-03-15 23:07:18 -04:00
Mark Story
ea64588a81
Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459
2010-03-15 22:55:14 -04:00
Mark Story
3ab687043e
Updating DboPostgres test to reflect changes in test suite.
2010-03-14 19:27:36 -04:00
Mariano Iglesias
1120d0daff
Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent
2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642
Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent
2010-03-14 16:34:57 -03:00
Mark Story
c059cf5175
Implementing cacheMethod(). Helps to solve #458 , as it provides features to control and clear method caches.
2010-03-13 22:55:18 -05:00
Mark Story
028668b7a6
Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450
2010-03-13 00:18:51 -05:00
Dieter Plaetinck
9a9bc3643b
fix typo in DboPostgresTestDb::testOrderAdditionalParams()
2010-03-10 14:34:17 -04:30
José Lorenzo Rodríguez
cbcd394d0b
Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time
2010-03-09 16:09:16 -04:30
José Lorenzo Rodríguez
acccf964a5
Fixing some tests for Postgres Dbo and adding test cverage for extra params in order function, closes #353
2010-03-09 15:24:03 -04:30
Mark Story
e6664f0ea4
Fixing SQL errors when running model_behavior tests with postgresql. Fixes #406
2010-03-07 19:02:19 -05:00
Mark Story
1ae922cea1
Fixing missing reference operators in test cases.
2010-03-05 22:06:20 -05:00
José Lorenzo Rodríguez
e4a5ca528c
Fixing virutal fields fetching for postgresql, closes #417
2010-03-05 16:07:59 -04:30
Mark Story
2a19a8d5e4
Updating CakeSchema test so it runs in both solo and group contexts. Changing table used on TestPluginComment to match its name.
2010-02-28 13:31:23 -05:00
Mark Story
ec5d9729b0
Model::find(first) no longer uses the id set in a model as the default conditions. Fixes #266
2010-02-27 11:32:29 -05:00
Mark Story
0960abcfb9
Removing workaround code for PHP 5.3.0. Error is no longer being generated in PHP 5.3.1
2010-02-27 11:26:16 -05:00
Mark Story
7075aa5e86
Fixing DboSource not quoting table/field names with - in them. Tests expanded . Fixes #323
2010-02-20 11:42:17 -05:00
Juan Basso
416abed211
Test of ticket #323 .
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-02-20 11:35:54 -05:00
Mark Story
6a3347ef7c
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/libs/tasks/model.php
cake/dispatcher.php
cake/libs/l10n.php
cake/libs/model/datasources/dbo_source.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
renan.saddam
63f7900ba1
Checking if the last query returned a error, tests added. Fixes #72 .
2010-02-17 22:31:00 -03:00
Mark Story
2279b1a736
Adding patches, and tests from tkykmw. Add support for plugin datasource drivers. Fixes #297
2010-02-16 22:35:16 -05:00
renan.saddam
d7b49e3494
Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324 .
2010-02-15 14:46:18 -03:00
Mark Story
0ce14ceb7e
Adding return statement, preventing infinite loops when no default fields are bound, and unbindTranslation() is called with no fields. Fixes #307
2010-02-11 22:03:43 -05:00