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
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
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
mark_story
f299283dc4
Refactoring duplicated code into a method.
2009-10-29 01:47:25 -04:00
mark_story
072e1efc13
Adding Datasource::enabled()
...
Allows for checking a datasource's ability to be used before attempting to connect it.
Added enabled() to all the core dbo's.
Fixes whitescreen when trying to use a non installed database driver.
Fixes #131
2009-10-20 16:11:31 -04:00
mark_story
d1f5acd0e0
Merge commit 'origin/1.2' into 1.2-merge-in
...
Conflicts:
cake/console/libs/shell.php
cake/libs/model/connection_manager.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
6dbba17d1b
Fixing issues with DboSource::execute() where queries would not be run if stats = false in the options. Tests added.
2009-09-30 00:37:06 -04:00
SkieDr
627eff5f24
Implementation of table level and field level parameters support
2009-09-29 22:54:48 +04:00
mark_story
5717e3b59c
Merge branch '1.2' into 1.2-merger
...
Conflicts:
app/webroot/test.php
cake/VERSION.txt
cake/bootstrap.php
cake/config/config.php
cake/console/cake.php
cake/console/libs/schema.php
cake/console/templates/skel/webroot/test.php
cake/libs/configure.php
cake/tests/cases/console/libs/schema.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
326424592d
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/libs/inflector.php
cake/libs/view/view.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
jperras
5a432c6f71
Applying fix from Ceeram for updateAll joins on model relations with no foreign key. Fixes #69 .
2009-09-09 00:00:53 -04:00
mark_story
c0a19ced14
Adding DboSource::getLog() and test case.
2009-09-01 23:23:47 -04:00
mark_story
cca3281f8c
Fixing complex expression handling in DboSource::fields(). Making AS a variable controlled by implementing dbo.
...
Test cases added.
Fixes #38
2009-08-19 13:03:36 -04:00
gwoo
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07:00
gwoo
887f8335ee
fixes #6539 quoting in buildIndex
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8267 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 18:25:25 +00:00
renan.saddam
76e50ef625
Adding support for Model.* syntax, which translates to a list of fields from Model.
...
Fixing buildColumn for null values.
Fixing small containable merge, it was duplicating values, tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8265 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 02:08:20 +00:00
gwoo
766e12bc2a
Merge branch '1.3' into 1.3-newlines
2009-07-25 10:41:40 -07:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
93d64c4e76
Removing use of e() from core classes. Refs #6525
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 13:35:14 +00:00
nate
a75d1fad2a
Modifying quoting method used in conditions with array values in DboSource, fixes #6519
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8243 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 01:50:11 +00:00
DarkAngelBGE
fefbe77208
Minor refactorings for DboMysql, DboSource and TextHelper
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +00:00
gwoo
f2b7a26be8
fixes #5710 , HABTM - constraining unique ids, but removing non-unique
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8217 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 03:31:05 +00:00
gwoo
92b8e87ed7
fix for cross database joins when recursive < 1
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8212 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:14:38 +00:00
nate
cb95f13608
Correcting issue in String::insert() where 0 offsets were handled incorrectly, affecting issue where values were not properly quoted and inserted into conditions strings. Fixes #6163 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8085 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 20:03:02 +00:00
nate
eea46e7cc8
Fixing issue where calculated columns were getting quoted incorrectly. Test included. Reformatting code to be 100 characters or less.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8084 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 18:36:32 +00:00
mark_story
ffc537aaa8
Minor optimization. Removing additional variable assignment.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8077 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 03:54:52 +00:00
mark_story
2a139b171c
Applying patch from 'farhadi' correcting regular expression when using magic findBy and fields that contain findBy in them. Fixes #6138
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8057 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 03:22:31 +00:00
mark_story
ce4fa20f3f
Fixing escaping of fields in hasAny() also adding in correct model aliases.
...
Tests added.
Fixes #6089
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8032 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-15 21:05:42 +00:00
mark_story
4b00c29eef
Updating doc blocks to improve readability in API.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
nate
d75b063dca
Correcting quoted-alias replacement in DboSource, adding (and mocking) MS SQL test, fixes #5942
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8003 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-16 19:08:44 +00:00
AD7six
704188e2b9
correcting shorthand if else statement
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7996 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 00:01:19 +00:00
mark_story
4a636b93a8
Fixing showQuery() when there is $error = false. Tests from 'zackenbarsch' added. Fixes #5983
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7978 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 04:12:46 +00:00
nate
a5b7276696
Correcting DboSource::order() identifier quoting, correcting bad DboSource tests, fixes #5900
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7942 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-18 20:49:25 +00:00
nate
1a6a0d1788
Fixing test for DboSource::expression(), moving $startQuote and $endQuote from DboSource to DataSource.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7859 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-10 18:57:50 +00:00
nate
16eebce7f7
Adding support for DboSource::expression(), plus test in Model case. Fixing code formatting in model test and View class -- wrapping lines at 100 characters.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7853 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-09 03:20:14 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
nate
40bf675589
Refactoring DboSource to remove use of str_split, adding $read (false to calls to) DboSource::value() inside DboSource::create(), cleaning up code formatting, fixes #5598 , fixes #5682
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7802 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 05:03:01 +00:00
phpnut
8ede5d21d3
Removing unreachable code
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7793 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 06:44:15 +00:00
mark_story
1b456f2cf1
Applying patch from 'davidpersson' fixing code spacing. Closes #5643
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
nate
2bfd5a4b3e
Refactoring schema test and fixing formatting, refactoring Model::_findCount() to use DboSource::calculate() in all cases, closes #4501
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7684 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-01 15:27:29 +00:00
gwoo
e6b994bcb1
updating handling of required classes, fixes #5480
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7666 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 14:03:16 +00:00
DarkAngelBGE
caa4e321f2
Fixing unneeded conditions in child queries when conditions are present in the model declaration; fixes #5323
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7645 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-22 20:08:31 +00:00
phpnut
8ae5866a1c
Additional optimization refactoring
...
Removed ability to use deprecated / with plugin, helper, etc combinations. The dot notation is only allowed from this point forward.
Corrected tests for the above changes.
Corrected formating in basics.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7623 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 03:09:19 +00:00
phpnut
cb487bd6e6
More optimization refactoring.
...
Fix cache but causing object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
nate
8b3a0a8782
Adding $options param to DboSource::execute()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7594 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 02:09:38 +00:00
DarkAngelBGE
8e546b23b8
removing commented code from dbo_source
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7576 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 04:47:52 +00:00
AD7six
ff7428e676
adding connection name to sql debug log
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7554 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 15:29:48 +00:00