Mark Story
09ad7418f5
Merge remote branch 'origin/1.2' into merger
...
Conflicts:
cake/console/templates/skel/config/inflections.php
cake/libs/model/cake_schema.php
cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
af4e9ba76e
Fixing php4 reference issues in CakeSchema.
2010-01-14 22:18:26 -05:00
Mark Story
8f2a4a1e0e
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a
Trimming trailing whitespace from files. Refs #201
2010-01-14 20:15:54 -05:00
Joël Perras
adb0c809a0
Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199 .
...
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
Joël Perras
199a14f3be
Updating Model::exists() to be more side-effect free.
...
Model::exists() no longer monkeys with the internal state of
Model::$__exists. The optional $reset parameter has also been removed,
as it is no longer needed.
2010-01-14 16:47:08 -05:00
Joël Perras
137704e397
Optimization to Model::save().
2010-01-14 16:47:08 -05:00
Joël Perras
15b8a3ec71
Updating copyright date on all files.
2010-01-13 23:47:14 -05:00
Joël Perras
4d1f6b82e8
Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100 .
2010-01-13 23:19:10 -05:00
José Lorenzo Rodríguez
8496055059
Adding php5 check to avoid errors when using __get() or __isset() methods in models
2010-01-13 12:57:41 -04:30
José Lorenzo Rodríguez
4e3aedecde
Fixing persitModel and plugin Behaviors. Closes #192
2010-01-13 09:53:00 -04:30
Mark Story
d8e7aa929c
Merge branch '1.3-misc' into 1.3
2010-01-12 17:18:14 -05:00
José Lorenzo Rodríguez
aa9258cbd1
Adding test for DboSource::group() and virtual fields
...
Closes #184
2010-01-11 12:22:59 -04:30
José Lorenzo Rodríguez
3fe4b46614
Fixing DboSource::group() to test for virtual fields when first parameter is not an array
2010-01-11 12:06:27 -04:30
José Lorenzo Rodríguez
cecfd72f28
Fixing parse error in php 4
2010-01-11 11:51:55 -04:30
Phally
bbb105fc8c
Added virtual field support for GROUP BY.
2010-01-11 11:46:59 -04:30
Mark Story
dda2414b5b
Fixing compatibility in ConnectionManager with php4. Fixes #187
2010-01-11 09:48:53 -05:00
Mark Story
4ada5b7eea
Fixing notice errors caused by incorrect datatyping in php4.
2010-01-11 09:44:51 -05:00
Mark Story
896414e632
Fixing parse error in PHP4 caused by optional arguments with default
...
values being passed by reference. Fixes #180
2010-01-11 09:40:56 -05:00
Joël Perras
730153b151
Adding isset() checks for CakeSchema::compare() when diff'ing db indexes.
...
Allows for slightly better interoperability between schemas generated with CakePHP 1.2 and with 1.3
2010-01-07 17:49:57 -05:00
predominant
804fba1a22
Adding block comments for Postgres Datasource quotes.
2010-01-05 23:23:23 +11:00
Mark Story
7dcf66dd95
Removing dynamic calling of setTablePrefix(). tableprefix should be with the tablePrefix property, and any other custom construction behavior should be done in an overridden Model::__construct.
2010-01-02 00:07:31 -05:00
Mark Story
eab706e772
Correcting and improving doc block for Model::__construct.
2010-01-01 23:59:36 -05:00
Mark Story
026eeb645b
Correcting and improving doc block for Model::__construct.
2010-01-01 23:58:07 -05:00
tPl0ch
1eff024e7e
Removed unnessecary connect keys from all Dbo's _baseConfig. Updated connect methods where needed. Fixes #132
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-27 12:47:52 -05:00
Mark Story
8b93235847
Fixing auto merge issues.
2009-12-27 12:45:34 -05:00
Mark Story
7a620b62b0
Merge branch '1.3-misc' into mergers
...
Conflicts:
cake/libs/model/datasources/dbo_source.php
cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961
Merge branch '1.2' into mergers
...
Conflicts:
cake/libs/inflector.php
cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
Mark Story
425dcf2df5
Applying patch from 'tPl0ch', connect key is set to 'mysql_connect' when not using persistent connections. Fixes #132
2009-12-22 13:23:55 -05:00
Mark Story
34410de7c8
Adding property definition for Model::$virtualFields
2009-12-20 16:26:12 -05:00
Mark Story
4ac0a55aff
Merge branch 'virtual-fields' into 1.3-misc
...
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
Mark Story
13ffcbc0ba
Updating doc blocks in Datasource. Adding missing reference operators.
2009-12-19 13:23:46 -05:00
Mark Story
7387cfdf6b
Adding @access tags and expanding doc blocks.
2009-12-19 13:06:32 -05:00
Mark Story
7fd9b5ae3b
Removing auto dump of sql log.
2009-12-19 12:40:32 -05:00
Mark Story
a89fcba243
Updating DboSource::getLog() and showLog() to use a View element.
...
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00
Mark Story
cbb29dcc5d
Extracting sql dump generation into a view element.
...
Changing the behavior of DboSource::getLog().
Adding sql dump element to layout.
2009-12-19 12:09:01 -05:00
Mark Story
959befb6e1
Merge commit 'josezap/virtual-fields' into virtual-fields
2009-12-18 19:11:50 -05:00
José Lorenzo Rodríguez
8f29f59c1a
Enclosing virtual fields in parentheses to avoid SQL errors
...
Added new tests to improve code coverage on virtual fields
2009-12-17 14:42:46 -04:30
Mark Story
b190e462b8
Fixing whitespacing.
2009-12-17 00:15:42 -05:00
Mark Story
4ac29963a8
Refactoring Model::__validateWithModels. Should be slightly faster as loops are smaller.
2009-12-15 22:55:34 -05:00
Mark Story
a490e249fa
Adding test for validation of with models canceling a save.
...
Adding initial implementation of Model::__validateWithModel().
Correcting error in previous commit. Adding tests for saveAll and validating habtm with models.
2009-12-15 22:55:22 -05:00
ADmad
33038c75ac
Removing redundant 'isset' check from DboMysql::connect
2009-12-15 20:41:44 +05:30
Mark Story
02330b2d9c
Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
...
Tests added
Fixes #66
2009-12-13 15:52:07 -05:00
José Lorenzo Rodríguez
c65e2f3f18
Quoting virtual fields in automatically
...
Updating test cases
2009-12-10 20:46:55 -04:30
José Lorenzo Rodríguez
8c4cad86c2
Fixing erroris due to bad rebase
2009-12-10 20:35:24 -04:30
José Lorenzo Rodríguez
4b9e03c9f7
Creating accesor methods for virtual fields and replacing direct access from DboSource with new methods
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
7a7d0de988
Adding support for virtual fields in DboSourse::calculate
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
d06ff5d10a
Adding support for virtual fields in conditions array
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
cf359a38b3
Re-adding ability to order by virtual fields in DboSource::order
...
Adding support for paginating virtual model fields in controller
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
051d352eab
Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster)
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
5a58813031
Making DboSource order by virtual fields
2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
7efafc685e
Fixing virtual fields fetching for Model::field() calls
...
Adding doc blocks
2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
22e36cb057
Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array
2009-12-10 20:08:12 -04:30
José Lorenzo Rodríguez
a81edb6080
Extending virtual fields implementation to work on queries with field list
2009-12-10 20:07:46 -04:30
José Lorenzo Rodríguez
53765312df
Initial implementation of model virtual fields
2009-12-10 20:07:07 -04:30
José Lorenzo Rodríguez
285329e7a4
Fake commit
2009-12-10 20:05:11 -04:30
José Lorenzo Rodríguez
2503632327
Working on virtual fields on order clause.
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
0ab2078284
Changing Model::hasField() api to accept second parameter for checking existance of virtual field
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
ec672e99e8
Fixing virtual fields fetching for Model::field() calls
...
Adding doc blocks
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
4685daf299
Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
f7a113d2b0
Convertig old-style find call to new api
2009-12-10 20:01:58 -04:30
José Lorenzo Rodríguez
00c0bb4d62
Extending virtual fields implementation to work on queries with field list
2009-12-10 20:01:58 -04:30
José Lorenzo Rodríguez
19c91f1f70
Initial implementation of model virtual fields
2009-12-10 20:01:58 -04:30
predominant
df151395c5
Moving certain datasources to the Datasources Plugin ( http://github.com/cakephp/datasources )
2009-12-11 01:07:23 +11:00
renan.saddam
c3bf6bc0e8
Checking for french error on dbo_mssql. Fixes #77 .
2009-12-09 21:20:55 -02:00
renan.saddam
931606f7f5
Checking for french error on dbo_mssql. Fixes #77 .
2009-12-09 21:10:37 -02:00
predominant
13ffd76178
Removing "Long description for file" from /cake/libs tree.
2009-12-08 20:19:02 +11:00
mark_story
24b636cc71
Merge branch 'mergers' into 1.2-merger
...
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05:00
mark_story
1f5c6eac2e
Fixing issues in tests caused by overwritten columns.
...
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
2009-12-06 21:46:05 -05:00
mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
be64f26f9f
Updating doc blocks for model::validates.
2009-12-03 00:53:31 -05:00
mark_story
02f9275e20
Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data.
2009-11-28 23:02:59 -05:00
ADmad
ad20e43730
Removing unneeded code for minor optimization
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -05:00
mark_story
64dffb7663
Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358
2009-11-24 22:49:40 -05:00
mark_story
6fdaa82969
Merge branch '1.3' into 1.3-merger
2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd
Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set.
2009-11-22 21:26:25 -05:00
mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
2e0acbf505
Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304
2009-11-22 17:56:46 -05:00
mark_story
a96c157d94
Applying optimizations to use of count() from 'jrbasso'
2009-11-21 15:14:21 -05:00
Juan Basso
71df8dbbba
Replace function sizeof (alias) by count.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c
Replace function die (alias) by exit.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
renan.saddam
4a8808eb21
Removing the argument passed to mssql_get_last_message(), it does not accept any argument.
2009-11-19 16:35:29 -02:00
renan.saddam
a33bd1d144
Removing the argument passed to mssql_get_last_message(), it does not accept any argument.
2009-11-19 16:28:11 -02:00
predominant
a91108a81a
Adding version check to getCharsetName() for MySQL Datasource.
2009-11-16 13:49:52 +11:00
mark_story
acd2c15690
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
0783176238
Replacing duplicated code with pluginSplit().
...
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
63ab96d751
Setting $primary = false inside DboSource::queryAssociation. Fixed #208
2009-11-15 17:48:41 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
mark_story
2c5fa171e0
Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
...
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b
Changes Model::find() to allow modification of DataSource connection during callbacks.
2009-11-12 14:48:03 -05:00
mark_story
6b5c247162
Merge commit 'origin/1.2' into mergers
...
Conflicts:
cake/bootstrap.php
cake/console/cake.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
6db91b0f49
Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253
2009-11-07 17:43:18 -05:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00