Commit graph

340 commits

Author SHA1 Message Date
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
DarkAngelBGE
58bbba0c4f refactoring DboSource::_mergeConditions()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7540 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-01 19:31:28 +00:00
nate
26e2747180 Fixing quoting of numeric literals in DboSource::order(), closes #5360
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7537 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-29 20:40:15 +00:00
nate
57e53775ff Automatically unescaping binary data in DboPostgres, and auto-handling boolean values, fixes #5118
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7517 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 04:21:01 +00:00
nate
b0b10f16ce Moving operator checking in DboSource::__parseKey(), fixes #5294 (extra = being added to queries with bound parameters)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7489 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-23 14:50:27 +00:00
nate
dbbbccdf18 Refactoring Router, fixed coding standards. Fixed quoting issue in DboSource::name(), affecting quoting of fields starting and ending with ()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7485 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-22 04:06:29 +00:00
mark_story
9cb854b48e Fixed default values being declared for integer column types when default = ''. Closes #5244
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7464 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-14 00:33:44 +00:00
nate
1fa9939965 Refactoring Cache key generation, fixing SQLite cache, and invalidating cache on database reconnect
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7455 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-12 21:08:51 +00:00
nate
b3395569cf Fixing quoting for complex conditions in DboSource, fixing broken DboSource tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7440 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-07 16:38:15 +00:00
gwoo
76f7d6dc43 making changes to all the model group to run. Currently I get 8/8 test cases complete: 1486 passes, 22 fails and 3 exceptions.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7439 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-07 15:36:26 +00:00
mariano.iglesias
eb02ec4ca9 Fixing issue on Containable when multiple unbindings take place on the same model, fixes #5096. Fixing notices on unmergable results on DboSource.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7424 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-02 21:56:55 +00:00