Commit graph

318 commits

Author SHA1 Message Date
phpnut
dbe9beb6cb Refactoring [5988]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5989 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-12 17:31:37 +00:00
phpnut
656ab3a9ab Closes #3530, SQL log not shown when enabling debugging only for certain actions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5988 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-12 11:51:30 +00:00
gwoo
fbd3811cd1 removing usage of Model::loadInfo() replaced by Model::schema(), removing new lines at the end of some files, removed deprecated chmodr() function from basics, updated bake and scaffold views
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5912 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-28 04:18:18 +00:00
nate
a87a0e2a68 Refactoring schema generation, passing model tests with SQLite driver, refactoring database methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5909 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-27 20:32:19 +00:00
phpnut
f41aa80b78 Removing vars that are no longer used.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5904 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-27 01:32:17 +00:00
phpnut
8d6599c34b Fixing bug for related records not being returned when using $recursive > 1.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5902 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-26 08:40:10 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
160cd28440 Correcting @return int
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
phpnut
da97a5c871 Correcting @return bool
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
nate
c8b6269a64 Refactoring find*() methods into Model::find(), i.e. Model::find('all', array('conditions' => ...)), findCount()/find('count') results are no longer filtered
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5834 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-21 18:34:23 +00:00
phpnut
fa1901f539 Closes #3182, Model find conditions strip text after newlines
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5799 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-19 08:46:22 +00:00
phpnut
fda664d737 Fixes #3282, Problem with _Token.fields and few submit buttons
Fixed failing Dbo*Test

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5725 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-06 04:37:58 +00:00
nate
a1fb0073a3 Adding MSSQL field quoting fix (Ticket #3203)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5715 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-04 05:04:44 +00:00
phpnut
3c316511ac Closes #3235, Missing relative model data when fetching a HABTM mixed up with belongsTo.
Patch from Mariano applied

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5642 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-15 20:34:27 +00:00
phpnut
fbe6179e7b Fixing habtm associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5636 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-15 07:50:32 +00:00
phpnut
a41b962ae5 Fixes #3147, Bake not detecting all associations
Fixed typo in DboSource::name()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5622 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-10 11:18:52 +00:00
phpnut
f1de783295 Fixing bug when instances of an HABTM association was automatically created.
Deprecated using $this->(ModelName) if an associations is created with an alias.

 
 	example with alias: var $hasMany = array('Assoc' => array('className' => 'ModelName'));
 					correct usage: $this->Assoc->modelMethods();

  	example without alias: var $hasMany = array('ModelName');
 					correct usage: $this->ModelName->modelMethods();

Fixed instances of 'className' that was still used in the core.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5608 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-29 20:47:03 +00:00
phpnut
e7921c7741 Initial work on single queries for hasAndBelongsToMany associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5607 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-29 13:33:14 +00:00
phpnut
d20ddfeadc Refactoring automatic model creations for HABTM associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5606 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-29 10:14:14 +00:00
phpnut
62124094b1 Added test for Ticket #3098.
Fixes #3098, sql errors if ORDER BY includes compare statement

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5597 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-29 01:02:21 +00:00
phpnut
0161f4f6d7 Fixes #3118 Prefix in models : can't use allow empty tablePrefix with a prefix defined in DATABASE_CONFIG
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5593 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-28 21:44:47 +00:00
nate
ce51d009ac Adding hasMany optimization fixes for failing model tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5587 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-27 03:15:11 +00:00
gwoo
4a79765b26 updating schema generation, adding table option to schema shell commands
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5567 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-21 23:22:15 +00:00
gwoo
8bb67d9f6a Adding Schema support, updated fixtures, deprecated loadInfo, changed Dbo::describe in all dbos, fixed tests,
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5563 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-21 21:46:59 +00:00
nate
44e978c194 Fixing hasMany SQL optimization (Ticket #3075)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5541 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-17 13:37:56 +00:00
nate
ad53804b60 Adding SQL function quoting fix in DboSource (Ticket #2987)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5472 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-29 12:21:41 +00:00
phpnut
549d86ac23 Refactoring dispatcher.
Added test for changes to Dispatcher.
Updating Model::_ _saveMulti(), moved the insert statement to DboSource::insertMulti() this will allow database that do not support multiple inserts in one statement to save data.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5460 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-25 04:38:28 +00:00
nate
629c0a9d63 Fixing quoting of boolean values in DboPostgres (Ticket #2594)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5416 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-09 04:03:51 +00:00
phpnut
8229587cfe Adding fix for #2837, dbo_source looping bug on parsing fields, can't use database function
Added test for #2837

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5397 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-08 02:29:37 +00:00
nate
588ab18197 Adding aliasing fix for DboSource::delete() and Model::deleteAll() (Ticket #2735)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5361 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-27 19:13:44 +00:00
phpnut
50aca85cc9 Adding fix for Ticket #2812
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5335 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-22 20:36:05 +00:00
mariano.iglesias
ceaae130a1 Fixing issue with DELETE statement and alias not being properly created
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5326 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-21 17:53:20 +00:00
mariano.iglesias
b870ea170c Fixing issue #2735, deleteAll() does not work correctly with model aliases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5323 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-21 15:40:03 +00:00
phpnut
dac1bd0913 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5315 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 07:51:52 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
phpnut
02d6c55d9f Adding fix for Ticket #2635, fixes Association data not correct if data is changed in afterFind()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5303 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 01:37:23 +00:00
nate
c7c578c2d1 Rolling back DboSource changes from 1.2 to 1.1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5287 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-17 00:36:25 +00:00
nate
9eb563d303 Refactoring DboSource::__quoteFields() and improving support for mixed string and array conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5285 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-16 23:44:56 +00:00
nate
3dbf59ece3 Fixing substring quoting in DboSource::__quoteFields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5274 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-12 15:13:53 +00:00
nate
6866ca42a0 Adding query conditions parenthesis fix for Ticket #2663
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5267 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-09 20:32:14 +00:00
gwoo
5e3c6def84 cleaning up auth, adding options to sort in paginator, adding preg match for database in dbo source
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5157 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-23 18:15:58 +00:00
phpnut
056c4cc054 Adding fix for #2613, fixes afterFind callback not called on models in depth search > 1 (recursive).
Changed the regex pattern matching in Router::stripEscape()

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5140 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-21 03:54:42 +00:00
phpnut
3a31e38937 Adding fix for failing DboSource tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5126 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-20 05:20:18 +00:00
phpnut
2be8041736 Applying patch from #2575 adds summary attribute to SQL query table in debug mode
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5105 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-15 04:16:40 +00:00
phpnut
9d02c911a6 Adding tests and fixes for #2570, this corrects DboSource::conditions fails to quote mixed array/string conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5087 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-14 01:52:59 +00:00
phpnut
137fea94c6 Cleaning up line endings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4994 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-03 04:35:25 +00:00
phpnut
4bac0a063b Removing deprecated code and files
/basics.php
 * normalizeList() Deprecated: see Set::normalize
 * countdim() see Set::countDim

libs/controller/components/request_handler.php
 * RequestHandler::disableStartup = false; see RequestHandler::$enabled
 * RequestHandlerComponent::setView() see RequestHandlerComponent::renderAs()
 * RequestHandlerComponent::setAjax() see RequestHandlerComponent::renderAs()

libs/controller/components/session.php
 * SessionComponent::flash() use $session->flash('key'); in your views

libs/controller/controller.php
 * Controller::_setTitle() see Controller::set()

libs/model/datasources/dbo_source.php
 * DboSource::fetchArray() see DboSource::fetchRow()
 * DboSource::one() see DboSource::fetchRow()

libs/model/db_acl.php
 * DB_ACL::getAco()  see AclComponent::$Aco::node()
 * DB_ACL::getAro() see AclComponent::$Aro::node()

libs/neat_array.php
 * Class is not longer available use libs/set.php Set class

libs/sanitize.php
 * Sanitize::sql() see Sanitize::escape()
 * Sanitize::cleanArray() see Sanitize::clean()
 * Sanitize::cleanArrayR() see Sanitize::clean()
 * Sanitize::cleanValue() see Sanitize::clean()

libs/view/helper.php
 * Helper::parseHtmlOptions() see HtmlHelper::_parseAttributes()

libs/view/helpers/form.php
 * define('TAG_DIV', '<div class="%s">%s</div>');
 * define('TAG_P_CLASS', '<p class="%s">%s</p>');
 * define('TAG_LABEL', '<label for="%s">%s</label>');
 * define('TAG_FIELDSET', '<fieldset><legend>%s</legend>%s</label>');
 * FormHelper::labelTag() see FormHelper::label()
 * FormHelper::divTag() see HtmlHelper::div()
 * FormHelper::pTag() see HtmlHelper::para
 * FormHelper::generateInputDiv() see FormHelper::input()
 * FormHelper::generateCheckboxDiv() see FormHelper::input()
 * FormHelper::generateDate() see FormHelper::input()
 * FormHelper::generateTime() see FormHelper::input()
 * FormHelper::generateDateTime() see FormHelper::input()
 * FormHelper::generateAreaDiv() see FormHelper::input()
 * FormHelper::generateSelectDiv() see FormHelper::input()
 * FormHelper::generateSubmitDiv() see FormHelper::input()
 * FormHelper::generateFields() see FormHelper::input()

libs/view/helpers/html.php
 * HtmlHelper::file() see FormHelper::file()
 * HtmlHelper::submit() see FormHelper::submit()
 * HtmlHelper::selectTag() see FormHelper::select()
 * HtmlHelper::formTag() see FormHelper::create()
 * HtmlHelper::linkEmail() see HtmlHelper::link()
 * HtmlHelper::dayOptionTag() see FormHelper::day()
 * HtmlHelper::yearOptionTag() see FormHelper::year()
 * HtmlHelper::monthOptionTag() see FormHelper::month()
 * HtmlHelper::hourOptionTag() see FormHelper::hour()
 * HtmlHelper::minuteOptionTag() see FormHelper::minute()
 * HtmlHelper::meridianOptionTag() see FormHelper::meridian()
 * HtmlHelper::dateTimeOptionTag() see FormHelper::dateTime()

libs/view/helpers/javascript.php
 * JavascriptHelper::linkOut() see JavascriptHelper::link()

libs/view/view.php
 * View::setLayout() use $this->layout in your view

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4981 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-02 08:07:19 +00:00
phpnut
1fa4e18487 Added fix for #2450
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4915 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 06:11:32 +00:00
phpnut
f1c03fe608 Adding fix for #2500 fixes adding of table.id when not using associated models and only wanting specific fields returned
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4914 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 06:06:15 +00:00
phpnut
5757d6b7e9 Adding fixes for test added in [4911] and [4912]
Fixed #2414 fixes findBy doesn't escape WHERE condition

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4913 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 05:37:39 +00:00
phpnut
0d69e3a085 Adding initial implementation of I18n database translation support
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4880 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-25 00:24:19 +00:00
nate
bb8c52dac0 Fixing display of core error messages
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4877 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-18 16:39:11 +00:00
nate
5461eec22d Adding fix for <> condition in DboSource (Ticket #2101)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4865 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-17 05:17:06 +00:00
phpnut
b752463592 Adding fix for Ticket #2391
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4840 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 20:49:41 +00:00
phpnut
30ea0fb69b Fixed typo in function name strpos replaces strrpos
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4832 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 22:41:17 +00:00
phpnut
8ed1b69b3f Refactoring association joins, Fixes the issue with adding the Model.id if it is not already added.
Adding fix for string based fields.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4831 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 21:30:55 +00:00
phpnut
dcf64033ed Adding fix for undefined index
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4827 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 09:40:56 +00:00
phpnut
00be91c954 Adding first implementation of hasMany associations using one select statement.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4826 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 08:54:25 +00:00
phpnut
cff6ea0ee8 Removing some duplicate code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4825 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 04:05:22 +00:00
phpnut
95e2782d72 Initial work on using one select statement for hasMany associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4824 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 04:00:04 +00:00
phpnut
9a6d54b400 Adding enhancement from Ticket #2366
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4823 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-08 23:30:31 +00:00
phpnut
3ec4ecd127 Adding fix for test in [4816].
This fixes hasOne association conditions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4818 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 20:12:06 +00:00
phpnut
d0c8cde9ab Adding fixes for test in [4811] fixes Ticket #1100
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4812 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 06:29:46 +00:00
phpnut
aaa2e3cf21 Refactoring duplicate code into one method
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4802 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 12:19:23 +00:00
phpnut
d5fa0a961b Adding fixes for Ticket #2357, Ticket #2358
Added tests from Ticket #2357, Ticket #2358
Fixed failing DboSourceTest:
source:/branches/1.2.x.x/cake/tests/cases/libs/model/datasources/dbo_source.test.php@4778#L1080


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4801 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-06 11:15:45 +00:00
phpnut
eae615527d Fixing last commit, had removed the ! prior to committing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4789 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:04:07 +00:00
phpnut
10bb0f303a Adding fix for duplicate conditions being merged into the final query on self associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4788 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 19:00:15 +00:00
phpnut
56451426fb Adding fix for Ticket #2317.
Added ability to cache queries to Model::query() by passing true as a second param.
Before this method would turn off caching automatically and there was no way to turn it on.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4784 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 16:50:03 +00:00
phpnut
f0cd2d49ea Adding fix for to correct additional 1:1 associations failing to query when there is a self join association.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4770 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 03:31:46 +00:00
phpnut
aeac37e707 Removing preg_replace() and adding additional param $where = true to DboSource::conditions()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4768 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 01:08:39 +00:00
phpnut
ea144501ae Fixing self association joins with conditions and fields
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4767 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 00:47:17 +00:00
phpnut
cc46c03f31 Adding fixes for association conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4763 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 21:40:59 +00:00
phpnut
da35cf3193 Adding fix for ModelTest::testRecursiveFindAll()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4761 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 19:55:57 +00:00
phpnut
49e58cec49 Adding fix for scaffold when using self associated HABTM
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4759 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 17:25:18 +00:00
gwoo
ed342c307d fixing check in magic methods for a value otherwise it will return false adding test to dbosource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4746 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-03 05:43:31 +00:00
gwoo
923303b462 fixing router when affected by requestAction #2319, adding check in magic methods for a value otherwise it will return false
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4740 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-02 19:20:50 +00:00
phpnut
918c6e7e93 Backporting changes to dbo drivers
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4715 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-30 02:54:23 +00:00
phpnut
3a62793d0e Adding fix for Ticket #2232.
Added tests for ticket

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4714 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-30 00:08:10 +00:00
nate
0c2b92a650 Fixing NOT operations in query conditions in DboSource (Ticket #2307)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4704 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 01:45:13 +00:00
nate
f32cc3eb79 Adding DboSource destructor rollback fix (Ticket #2110)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4703 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 00:49:53 +00:00
nate
8b7f46acaa Adding field quoting fix in DboSource::name() (Ticket #2300)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4697 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-28 00:53:37 +00:00
nate
dbbe90c22c Fixing issue in DboSource with left joins on self joins
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4687 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-27 01:59:39 +00:00
nate
f2c7c5a677 Fixing calculated field parsing for DboSource::fields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4686 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-27 01:34:59 +00:00
nate
bb2a68caec Rewriting SQL generation for self-joins
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4679 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-26 17:16:43 +00:00
nate
6afca88bb2 Patching SELECT query test in DboSource::fetchAll() (Ticket #2288)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4678 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-25 19:46:16 +00:00
nate
c65f2a1fd2 Fixing boolean conditions expression handling in DboSource::conditionKeysToString() and added test case (Ticket #2268)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4647 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-22 00:59:28 +00:00
nate
2a095d9ea6 Fixing redundant SQL condition generation in DboSource::conditionKeysToString(), fixing SQL ORDER parsing (Ticket #2266) and updating test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4644 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-22 00:26:42 +00:00
nate
5197bf60d3 Updating DboSource with new query generator, and updating model/dbo test cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4636 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-20 17:38:53 +00:00
phpnut
a9c128b0ec Adding fix for Ticket #2101.
Changed Helper::loadConfig() to accept a param with the name of the file to load

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4589 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-05 13:48:21 +00:00
phpnut
55a66a9091 Adding fix for Ticket #2084
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4574 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-04 05:19:30 +00:00
dho
076a5dbd63 Renaming $__transactionStarted to $_transactionStarted (ticket #2141)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4527 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-17 08:28:09 +00:00
dho
34c63427fb Renaming $__sources to $_sources (ticket #2140)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4526 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-17 07:31:29 +00:00
nate
6989f80376 Fixing the display of SQL errors when DEBUG > 0
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4520 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-15 03:03:17 +00:00
nate
30134cbd9e Importing new ACL system
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4487 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-09 08:13:13 +00:00
nate
fbc0ea77b7 Fixing $conditions === true in DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4478 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-08 18:13:14 +00:00
phpnut
af4bacb960 Reverting changes made in last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4477 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-08 17:58:19 +00:00
nate
15f7509171 Refactoring set() method into Object, and adding $conditiions === true translation in DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4475 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-08 17:33:59 +00:00
nate
b4cc0dfd96 Adding numeric value quoting fix for DboSource (Ticket #1927)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4411 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 15:21:51 +00:00
phpnut
a8a91e35be Correcting all headers in the files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
nate
75d8f42684 Adding magic method fix for null query values (Ticket #1999), and adding PostgreSQL boolean quoting patch (Ticket #1788)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4396 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 02:21:44 +00:00
phpnut
ce033247ed Adding patch from #1844
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4394 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 23:58:02 +00:00
phpnut
03d15ff892 Adding fix for #1928
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4393 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 23:43:56 +00:00
phpnut
5c79d064aa Reverting changes recent changes to DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4375 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 02:49:19 +00:00
nate
67c5c43761 Fixing undefined variable notice in DboSource::update()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4374 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 02:15:52 +00:00
nate
f1912bbe60 Fixing $fields error for belongsTo associations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4373 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 02:13:33 +00:00
nate
0698b9cdf6 Updating DboSource with new query generator implementation, and updating DboSource tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4368 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-31 23:25:05 +00:00
nate
caeed6bf4c Adding PostgreSQL conditional expressions to DboSource (Ticket #1914)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4360 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-31 21:07:32 +00:00
nate
1df76850c3 Enabling join models for all DBOs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4342 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-28 01:53:35 +00:00
nate
4f794248af Fixing magic method query generation for array condition values (Ticket #2008)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4340 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-27 17:48:48 +00:00
nate
dbbfa5b837 Fixing column quoting for array-based conditions when columns are wrapped in SQL functions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4330 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-24 20:04:27 +00:00
nate
51cf77d4cc Fixing issue with conditional values being empty arrays in DboSource::conditionKeysToString()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4319 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-22 19:21:21 +00:00
phpnut
658ab33959 Adding fix to allow Configure::write('debug', '0'); in a controller method
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4248 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-04 16:13:24 +00:00
nate
2ea8e4edee Adding NOT query conditions fix for Ticket #1793
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4167 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-23 21:24:30 +00:00
phpnut
4f1c5ef386 Wrapping all core messages in translation function
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4129 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-22 22:49:47 +00:00
dho
9ca5e14891 Adding new methods to Configure and moving all core messages using DEBUG to use Configure::read()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4069 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-12-05 09:49:59 +00:00
phpnut
83afee9a52 Merging fixes between branches for DboSource::generateAssociationQuery()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4037 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-30 22:26:24 +00:00
nate
cc484ddbd2 Adding DboSource::order parsing fix for Ticket #1677
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4004 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-28 08:18:53 +00:00
nate
b479c5f49e Adding fix for Ticket #1701
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3989 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-27 05:32:18 +00:00
nate
e955f3fd65 Refactoring DboSource::update(), and adding magic finder method fix for Ticket #1673
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3955 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 07:53:31 +00:00
nate
26955aefda Adding coding-issue fix (Ticket #1633), and insert ID fix (Ticket #1641), and updating method reference
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3857 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-10 18:45:46 +00:00
nate
eb01aad01d Fixing associations for ADODB driver (Ticket #1568)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3806 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-03 04:10:40 +00:00
phpnut
708dc77ae8 Merging __mergeAssociation() into 1.2 branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3793 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 19:27:08 +00:00
phpnut
f187ac9cef Adding fix for IN( sql.
Merging fixes between versions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3792 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 19:19:11 +00:00
dho
613bb29300 Adding special log output for cli
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3791 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 15:58:52 +00:00
phpnut
29ba60481a Fixing DboSource::execute() so it only logs when fullDebug is set to true
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3782 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 03:52:41 +00:00
nate
2046eed40d Refactoring DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3740 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-25 13:27:32 +00:00
nate
57f27126bd Adding conditions-based updating to DboSource
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3709 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-18 15:38:37 +00:00
nate
eea428e55d Code formatting and 1.2 interface updates
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3689 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-16 20:02:34 +00:00
nate
76e52d3862 Adding fix for decimal numbers being quoted (Ticket #1360)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3618 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 21:42:35 +00:00
nate
1842759ed4 Adding 'with' join fixes, and field quoting fix for Ticket #1445
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3614 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 21:03:45 +00:00
nate
f01e1a28f4 Adding field quoting fix for Ticket #1372
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3536 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-21 03:56:57 +00:00
phpnut
bdf3e7e61f Fixed #1433
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3524 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-20 03:26:52 +00:00
phpnut
2d6eee36ac Refactored fix that was created in [3519]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3521 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 15:24:15 +00:00
phpnut
6cc9c12839 reverting changes made in [3519]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3520 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 15:17:17 +00:00
phpnut
79ad31c514 Adding fix for #833.
Fixes recursive >=1 when using Model::findCount();
Removed all fields being added to the query.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3519 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 07:20:51 +00:00
phpnut
fb7585e7ee Added fix for #1345 and #1417.
This fixes Self Referencing Models losing data when recursive > 1

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3513 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-19 02:08:54 +00:00
phpnut
fc54b0f31a Adding fix for #1165.
Changing Model::__constructLinkedModel() to use the association name for 
the instance of an associated model.
Changed DboSource::read() to use the association name.


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3484 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 21:59:51 +00:00
phpnut
10ad71b30c Adding fix for association query when the association has a null value
for a FK


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3473 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-14 02:11:38 +00:00
nate
93f7dd32ca Fixing issue with magic field values ({$__cake_ID__}) being quoted twice
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3464 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 07:09:14 +00:00
nate
9f454bf5b9 Fixing operator parsing issue with array-based conditions (Ticket #1364)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3447 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-04 13:37:26 +00:00
nate
cb87dfc71d Fixing issue with empty $conditions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3442 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-30 16:00:20 +00:00
nate
b46c20ead4 Fixing limit/offset bug in hasMany/hasAndBelongsToMany associations, to enable paging of related models
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3435 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-27 16:47:05 +00:00
nate
be1737114c Adding $primary parameter to Model::afterFind() (and Behavior::afterFind())
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3408 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 08:00:54 +00:00
nate
86e9b9090a Adding 'IS NULL' fix from Ticket #1075, and fixing join issue with AND NOT
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3401 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-15 19:19:39 +00:00
phpnut
4347f25025 Reverting changes made by gwoo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3284 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 16:45:18 +00:00
gwoo
c19dbc8806 added model property assoc. this allows access to the association keys => conditions, fields, order, limit, offset from the controller
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3281 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 15:05:01 +00:00
nate
07ec77ef22 Adding model behaviors, model onError callback, and updating FormHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3280 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 14:13:07 +00:00
nate
bc745b234a Making same change as [3235]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3236 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-12 04:37:49 +00:00
nate
4e183bf492 Fixing notices generated by new HABTM features
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3213 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 15:29:55 +00:00