Commit graph

410 commits

Author SHA1 Message Date
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
0ed8c17f80 Fixes Ticket #2999, HABTM save multiple for PostgreSQL
Merged changes from 1.2 DboOdbc into 1.1

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5603 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-29 05:07:16 +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
gwoo
9d0502943a fix for odbc, closes #3145 and closes #3146. changes will be merged to 1.1 shortly
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5594 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-28 22:46:57 +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
476007f0f4 firebird dbo fix from #2936
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5575 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-24 05:17:59 +00:00
gwoo
b3859caa7e updating dbo_mysql buildColumn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5574 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-24 00:47:49 +00:00
dho
f2e5dcbbf9 Fixing syntax errors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5572 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-23 05:43:12 +00:00
gwoo
84ff113d1d updating schema
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5571 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-23 00:57:00 +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
8f8e471b5b Adding fix for DboMssql::lastError() (Ticket #3073)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5556 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-20 13:16:12 +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
phpnut
bdaca1698b Adding fix for #2959, Missing arguments for DboAdodb::fields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5453 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-24 12:49:58 +00:00
nate
42c5cb3a16 Fixing MySQL port configuration for persistent connections
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5452 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-23 00:46:42 +00:00
phishy
4d4cf07c84 fixed timestamp issues, added data_length to table descriptions, fixed bugs in value method, added
generateColumnSchema method


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5438 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-14 21:25:04 +00:00
nate
7e499f1f14 Disabling integer column length for Postgres (Ticket #2814)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5417 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-09 04:31:39 +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
38bf760524 Adding fix for #2813, dbo_oracle.php's value function adding additional quotes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5414 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-07-09 02:57:56 +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
905549cc89 Adding fix for Ticket #2819, fixes postgrsql schema problems when setting 'schema' => '"some_shcema"'; in database settings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5342 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-23 07:57:18 +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
phpnut
0211a2a32a Adding fic for #2651, fixes query creation problem in DboAdodb
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5284 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-16 23:38:50 +00:00
phpnut
54159742c0 Adding patch from #2652 fixes SQLite LIMIT statement broken
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5283 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-16 23:08:20 +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
phpnut
a42d973ab0 Adding fix for #2650, fixes alias in DboAdodb::fields()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5253 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-06 19:12:53 +00:00
dho
c58a7e95b9 Fixing typo (ticket #2674)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5226 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-31 06:00:52 +00:00
phpnut
0bd813132f Correcting quoting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5168 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 06:03:55 +00:00
phpnut
a276f28a00 Correcting DboSybase class methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5167 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 05:58:55 +00:00
phpnut
232b109bef Adding enhancement suggestion from #1565 to all Dbo classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5166 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 05:33:55 +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
90022227b4 Correcting doc comment
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5153 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-22 03:11:45 +00:00
phpnut
2099da50c1 Adding Firebird support
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5152 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-22 03:09:06 +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
96da12358f Adding fix for #2521, this fixes issues with DB2 driver cannot determine the table name of result sets, which breaks associations. Added enhancement for #2446, DB2 driver allowing schema to be specified in the database.php file
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5114 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-16 07:50:02 +00:00
nate
4ba97ca0da Adding sequence map to DboPostgres for database tables using non-standard sequences
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5110 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-15 19:11:09 +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
nate
f7e4594df7 Adding schema support to Postgres driver (Ticket #1623)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5085 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-14 00:15:44 +00:00
phpnut
48d39f1b45 Merging [5070] into DboMysqli and also adding changes to 1.1.x.x versions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5072 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-13 14:52:17 +00:00
dho
2cac3f7c1d Fixing problem in listSources when using '-' in database name
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5070 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-13 09:13:11 +00:00
phpnut
2fa0bd866c Adding fix for #2534, refactored mysql and mysqli dbo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5043 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-12 06:35:32 +00:00
phpnut
94cbbe560f Added fox for #1815
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5042 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-12 05:49:22 +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
5b70a957bb Adding fix when mysql_connect is set as a connection in the database config and persistent key is not set in the config, the default for persistent is true and this would override the settings in the database config
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4945 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-30 10:56:22 +00:00
nate
7f4201280e Fixing last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4923 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 09:14:09 +00:00
nate
f28e6d5b77 Removing fields() method from DboDbo2 (Ticket #2444)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4922 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 09:11:35 +00:00
phpnut
87cfb1766d Adding fix for #2416 fixes Invalid query when using boolean conditions in PostgreSQL
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4916 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-29 07:02:25 +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
1d64691014 Adding fixes from phishy.
Added fixed for #2492

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4887 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-27 06:43:40 +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
nate
86d32e4313 Adding fix for misquoted SQL functions (Ticket #2199)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4861 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-16 21:49:28 +00:00
nate
c9b2da1380 Adding field map to convert aliased column names in MSSQL queries
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4859 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-14 23:34:08 +00:00
phpnut
94704a2518 Adding patch from Ticket #2374
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-12 07:46:29 +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
nate
d416fbe4ed Removing name() method from DBO drivers (Ticket #2372)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4830 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 19:54:07 +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
784ee985b5 Adding fix for Ticket #2363
Removed use of:
mysql_insert_id($this->connection);
mysqli_insert_id($this->connection);

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4810 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 01:42:12 +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
ba8421cce2 Adding fix for Ticket #2347
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4785 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 17:09:52 +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
phpnut
dcac88825a Adding fix for Ticket #2339
Adding fix for Ticket #2335
Adding fix for Ticket #2344

Merged changes in dbo from 1.2 to 1.1
Merged changes to session handling in 1.2 to 1.1
Merged changes to Model::_ _saveMulti() in 1.2 to 1.1
Added Set::pushDiff() to append differences in array 2 to array 1
Added SessionComponent::activate() and SessionHelper::activate() to turn sessions usage on if AUTO_SESSION is set to false
Added test for Ticket #2343
Added change to AclNode to use correct table naming
Added garbage clean up to CakeSession::_ _close(); some installs, like Debian, have removed garbage clean
up and use a cron job instead. Currently this change is only supported for database session.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4752 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-04 07:25:48 +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
nate
a64434c636 Misc. fixes to DboPostgres, added basic schema generation, and fixed getting insert IDs from sequence (Ticket #2309)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4727 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-01 05:42:31 +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
phpnut
575b27d586 Backporting changes from 1.2 to 1.1
Adding Set class

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4711 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 22:48:24 +00:00
nate
15bae17de2 Removing column length from INT column type in DboMssql (Ticket #2308)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4706 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-29 02:21:50 +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
43297e3abd Fixing limit / offset for SQL Server
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4700 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-28 16:39:15 +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
phpnut
f8023ff0dc Added $config['database'] mysqli_connect() in DboMysqli::connect(), removed mysqli_select_db()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4661 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 10:56:42 +00:00
phpnut
330630c9d0 Adding fix for Ticket #2214
Removed persistent connection setting in DboMysqli::connect() since there is no persistent connection function for mysqli

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4656 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 08:57:42 +00:00
phpnut
2925df7c54 Adding fix for #2210
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4655 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 07:08:40 +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
c2c17f9b90 Fixing MySQL schema generation for null columns
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4637 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-21 05:00:54 +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
nate
de7423e4b6 Adding phishy's Oracle patch, fixing Sybase queries and column defs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4620 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-16 14:23:54 +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
phpnut
b3b1c80a69 Adding patch from Ticket #2176, extracts the sequence name from the default value for the primary key and returns it's last value
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4572 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-04 04:54:48 +00:00
phpnut
82d0c2e742 Adding fix from Ticket #2074
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4569 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-04 04:05:57 +00:00
phpnut
ff434df4e5 Adding fix for #1815
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4534 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-18 13:17:28 +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
64bbd74c85 Refactoring ACL and tree code for query optimization changes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4521 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-15 06:09:20 +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
phpnut
074598a96f Adding the DB2 driver submitted by Daniel Krook
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4519 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-14 20:41:06 +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
phpnut
f0eac2527c Adding fix for #2047
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4437 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-04 02:46:12 +00:00
nate
46aa081d5c Adding SQL Server column aliasing fix for hasMany/HABTM associations (Ticket #1931)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4416 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 20:14:03 +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
phpnut
9b28c2ed27 Adding fix for #2021
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4403 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 04:39:48 +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
gwoo
8f7add9c29 adding patch to dbo_postgres, #1828
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4395 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 00:06:26 +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
96f8227255 Adding fix for #1822
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4378 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 03:38:27 +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