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
|
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
|
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
|
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
|
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
|
ec672e99e8
|
Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
|
2009-12-10 20:05:10 -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
|
13ffd76178
|
Removing "Long description for file" from /cake/libs tree.
|
2009-12-08 20:19:02 +11: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 |
|
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
|
a96c157d94
|
Applying optimizations to use of count() from 'jrbasso'
|
2009-11-21 15:14:21 -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 |
|
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
|
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 |
|
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 |
|
predominant
|
5dfe1777af
|
Removing Subversion file headers.
|
2009-11-06 16:51:09 +11:00 |
|
predominant
|
ceee56013c
|
Remove Subversion $Date$ lines.
|
2009-11-06 16:17:01 +11:00 |
|
predominant
|
04f1b6cdfe
|
Remove Subversion $LastChangedBy$ lines.
|
2009-11-06 16:11:16 +11:00 |
|
predominant
|
42f3f16d60
|
Remove subversion $Revision$ lines.
|
2009-11-06 16:08:02 +11:00 |
|
predominant
|
1b9b0aae5e
|
Updating Copyright date to include 2009.
|
2009-11-06 15:34:28 +11:00 |
|
predominant
|
8f75ff58c7
|
Removing @filesource
|
2009-11-06 15:24:02 +11:00 |
|
mark_story
|
a3bb77c4f3
|
Merge branch '1.2' into 1.3-merger
Conflicts:
cake/console/libs/acl.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/model.php
cake/console/libs/templates/skel/views/layouts/xml/default.ctp
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/validation.php
cake/libs/view/helpers/form.php
cake/tests/cases/basics.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/cake_test_case.test.php
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/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/groups/controller.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/no_database.group.php
|
2009-11-01 12:11:49 -05:00 |
|
mark_story
|
5f1e6ba6a0
|
Making DboSource::fetchAll return $this->_result if it is a boolean and $out is empty. Allows for Model::query() to return boolean values for operations that do not return recordsets. Fixes #6404
|
2009-10-29 20:31:29 -04:00 |
|
mark_story
|
a33457155f
|
Adding valid option checking to fieldParameters.
Test case added.
|
2009-10-29 02:03:21 -04:00 |
|