gwoo
643651fe56
Merge master in 1.3
2009-03-19 14:10:13 -07:00
nate
80d4dfa306
Cleaning up previous commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8088 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 00:22:28 +00:00
nate
4466c9f7b7
Reverting changes to Behavior so that all models use the same behavior instance, fixes #6038 , refs #4408 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8087 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 00:06:41 +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
1497fddf80
Applying patch from 'rafaelbandeira3' fixing formatting of generated code to better follow cake coding standards. Fixes #5754
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8082 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 18:05:18 +00:00
mark_story
965b8e9641
Updating doc blocks on tree behavior.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8081 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 17:12:30 +00:00
mark_story
62ea98bdb2
Fixing minor typo in model.php. Closes #6176
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8080 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 16:20:11 +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
gwoo
7dc627dd19
refs #4119 , another check for binary uuid
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8074 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-04 01:36:53 +00:00
gwoo
088815834e
fixes #4119 , refs #6151 binary uuid
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8070 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 16:33:17 +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
renan.saddam
52f4cd42db
Fixing issue when Model::$translateTable is set
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8050 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-19 13:45:51 +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
b1b67c811c
Applying patch from 'ralph.marchildon' Fixes saving habtm data using 'with' data. Fixes #6077
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8021 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-11 03:53:04 +00:00
mark_story
d3ee6b31f1
Added conditional check for compatibility with MySQL 4.x result sets to DboMySqlBase::index(). Tests added. Thanks to 'teknoid' for the help. Closes #4503
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8020 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-08 23:09:08 +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
mark_story
1895f1c3be
Fixing saveAll() when used in conjunction with belongsTo data and validate => first. Tests added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8010 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-25 23:48:28 +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
nate
76fba20721
Adding sanity checking to setup() callback for behaviors.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8002 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-16 17:49:41 +00:00
mark_story
1111829e99
Fixing issue in __saveMulti() where unique was not always honoured. Thanks for the patch 'Jafinto'. Tests added. Closes #6006
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8001 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-16 04:09:44 +00:00
AD7six
b9ea171429
fixes #6003 tree behavior fails with uuids
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7997 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 00:50:01 +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
AD7six
56afb72825
changing $model for $Model to follow conventions ($Model is an object)
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7994 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:21:53 +00:00
AD7six
eec4d15898
fixes #5971 - Error generated by behavior if invoking overloaded method from within the behavior
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7993 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:19:59 +00:00
gwoo
c53c28760f
closes #5968 , refs #5798 , reverts [7893], when dependent is true, conditions are not respected on HABTM associations when deleting parent record. [7893] would result in orphaned records. If more fine grained control is needed, create a model for the join table and handle it on an application/applicaiton basis.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7988 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:01:01 +00:00
gwoo
ff340d33ce
fixes #5926 , table prefix on acl tables when overriding constructor
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7980 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 17:43:46 +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
mark_story
94b9bcae89
Fixing habtm with uuid join tables with an auto model. Tests & model classes added. model test runs slightly more smoothly on postgres as well. Fixes #5940
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7966 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-30 16:09:25 +00:00
phishy
afe9970157
Fixes #5939
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7965 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-29 21:37:01 +00:00
mark_story
b063f22f31
Fixing habtm joins for tables with two uuid fields, no primary key and a defined join model. Adding fixtures.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7953 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-23 23:28:08 +00:00
gwoo
3eb9f65e99
fixes #5909 , return for __() for translate behavior errors
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7947 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-21 17:32:30 +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
8eade1adb3
Fixing code formatting to wrap at 100 characters, adding fix for ticket #5596 , counterCache now decrements properly when foreign key value changes.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7927 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 04:13:45 +00:00
mark_story
ea9c080b1c
Adding alterSchema() to dbo_postgres. Also handles index alters. Tests added for field and index alter sql.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7923 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-16 04:38:48 +00:00
mark_story
48c65c4092
Adding index() to dbo_postgres. Tests added for index introspection. Also fixes object to string conversions when working with database expressions. Fixes #5867
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7922 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-15 02:25:55 +00:00
TommyO
a601129d46
Brings odbc driver mostly up-to-date. Fixes #5730
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7921 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-14 18:36:40 +00:00
phpnut
0d3ea7a5f2
Adding fix when join table does not have a primary key 'id' defined
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7918 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-12 17:19:27 +00:00
mark_story
43af288eca
Adding index(), alterSchema(), dropSchema() support to MySQLi driver. Refactored MySQL & MySQLi drivers. Updated and fixed tests.
...
Fixes #5824
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7915 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-11 00:13:11 +00:00
mark_story
569b9dd48a
Adding index() to dbo_sqlite. Tests added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7913 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-10 03:38:10 +00:00
phishy
caa063590d
Fixed #5800 . Fixed INSERTs broken by refactoring of DboSource::renderStatement()
...
Also added slightly more support for CakeSchema with DboOracle
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7912 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-10 01:30:36 +00:00
mark_story
d405d1d1c3
Adding indexes to alterSchema() and CakeSchema::compare(). Thanks for the test case and patch 'bamyers99'. Fixes #5862
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7910 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-09 04:54:58 +00:00
mark_story
930a2d954f
Fixing infinite loop in AdoDB when trying to get result sets with more than on result. Fixes #5846
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7908 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-08 03:13:45 +00:00
mariano.iglesias
da39ce77b9
Fixing order of associated results on test that was making a test to fail. Fixing issue where HABTM conditions were not being taken into account when deleting links. Adding tests, fixes #5798
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7893 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-26 14:15:51 +00:00
AD7six
2f51ccca04
fixes #5772 .
...
Sql errors when using reserved words for a field name with the tree behavior.
Test Case restructured to allow thorough testing of the various permutations inwhich the tree behavior can be used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7880 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 13:57:44 +00:00
mark_story
8759f4ae28
Fixing reset of Model::__exists when create() is called. Test added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7878 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-19 15:53:41 +00:00
mark_story
6806b895cb
Fixing merging of actsAs and _findMethods from PluginAppModel classes. Adding test cases and necessary test classes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7875 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-14 20:24:27 +00:00
nate
f06401c563
Correcting regex that parses default values from schema in DboMssql, fixes #5748 . Thanks Pixilation for the patch and test case.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7873 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-14 02:00:02 +00:00
renan.saddam
400fadd091
Fixing TranslateBehavior bug when $query['recursive'] is set. Fixes #5593 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7869 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-12 19:45:30 +00:00
mark_story
eccfea3429
Fixing ModelBehavior::detach() when non 0 index behaviors are detatched. Tests Added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7862 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-11 00:17:37 +00:00