mark_story
d66d37c92b
Merge branch 'master' into 2.3
2012-08-24 22:50:29 -04:00
mark_story
b2f62f46c5
Fix failing tests in postgres.
2012-08-24 22:37:23 -04:00
Ceeram
f06ce1324d
Merge branch '2.2-habtmmerge'
2012-08-24 10:45:45 +02:00
mark_story
dcc5a95482
Only split on ; for TABLE related statements.
...
Fixes #3142
2012-08-23 23:11:00 -04:00
Ceeram
cb80338c7d
avoid duplication in return value when saving habtm
2012-08-24 00:50:46 +02:00
Ceeram
c5ebbc991c
Revert "Merge pull request #784 from ceeram/habtmmerge"
...
This reverts commit fa5aa6278f88604ac757
2012-08-23 16:00:41 +02:00
Ceeram
fb0053753e
avoid duplication in returned results for habtm
2012-08-22 13:03:47 +02:00
mark_story
d5333a2ff1
Merge branch 'master' into 2.3
2012-08-20 16:20:27 -04:00
Stephen Cuppett
7e5f326300
Fix STRICT warnings on PHP 5.4
2012-08-19 17:00:26 -04:00
euromark
e1fbfcef00
fix contain for find method
2012-08-13 08:10:51 +02:00
mark_story
0bbf61ce3d
Add removed getDataSource() call.
...
This fixes an issue where the wrong datasource could potentially be used
for getting the full table name.
2012-08-10 21:48:22 -04:00
euromark
bed5453be0
correcting order
2012-08-08 14:44:38 +02:00
euromark
5e0e850733
reduce 5-level if cases to 2 levels
2012-08-08 13:42:40 +02:00
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
mark_story
788cf52572
Fix saving empty values for translated fields with multiple locales
2012-08-03 22:40:38 -04:00
mark_story
c96e364cbb
Fix incorrect expiry of sessions.
...
Fixes #3088
2012-08-02 21:03:53 -04:00
mark_story
cffc36e4e0
Fix notice error when impossible conditions are created.
...
Fixes #3084
2012-08-01 23:05:56 -04:00
Mark Story
2728c6253e
Merge pull request #728 from boast/patch-2
...
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
2012-08-01 19:41:04 -07:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
mark_story
27e2132a13
Generated SQL should not contain multi-column primary keys
...
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.
Fixes #3069
2012-07-27 22:31:49 -04:00
mark_story
162d3bcb29
Fix whitespace errors.
2012-07-23 22:44:05 -04:00
David Thalmann
f926ae7637
Clean up string concatenations and refactored some reused strings into variables.
...
Refs #GH-729
Signed-off-by: mark_story <mark@mark-story.com>
2012-07-23 22:30:28 -04:00
mark_story
ed19821168
Merge branch 'master' into 2.3
2012-07-22 21:01:28 -04:00
mark_story
e6ef218600
Fix associated translations being inserted.
...
Due to changes introduced in [1c0b6c076aFixes #3057
2012-07-22 20:59:24 -04:00
David Thalmann
78de6e276a
Removed inline method calls in curly braced string concat's.
2012-07-22 03:40:49 +03:00
David Thalmann
d9b5ec1a3a
Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
2012-07-21 22:07:51 +03:00
euromark
01f1b0dadc
correcting previously added app uses statements
2012-07-21 20:29:49 +02:00
euromark
4fe1ab1bf6
missing app uses statements
2012-07-21 13:34:33 +02:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
Mark Story
83cef3ef9a
Merge pull request #718 from dereuromark/2.3-fix-validation-error-message
...
2.3 fix validation error message
2012-07-17 19:57:16 -07:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
mark_story
a63dd9ee9d
Fix incorrect formatting in TreeBehavior.
...
Fixes #3045
2012-07-17 21:06:41 -04:00
euromark
760cf33ce3
make sure a missing validation rule always triggers a warning (in productive mode this will be logged in the log files)
2012-07-17 10:47:20 +02:00
mark_story
a7c79e5da2
Fix warnings when deleting records that do not exist.
...
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
8fc5726920
Remove trailing whitespace.
2012-07-11 21:39:32 -04:00
Jose Lorenzo Rodriguez
39715bcd89
Adding missing afterValidate callback to behaviors, Fixes #3024
2012-07-10 20:35:26 -04:30
Thomas von Hassel
1c0b6c076a
Update afterSave to ensure created entires have all translated fields present
...
Without all fields being present, find() will be unable to find the
translated records.
Fixes #3009
2012-07-07 12:03:29 -04:00
mark_story
eb7b66b37c
Revert default value of allowEmpty.
...
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods. Move some tests around and update tests that
probably should have been failing before.
Fixes #2983
2012-06-24 20:06:14 -04:00
mark_story
5e54be4e5a
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303
better error message in MissingConnectionException when driver is not enabled
2012-06-23 11:42:26 +02:00
Ceeram
71112d1225
No need to create new instance of ModelValidator when one is already created
2012-06-20 14:57:56 +02:00
Ceeram
60c611fa47
Parse rules in getField()
2012-06-20 14:54:32 +02:00
Ceeram
03e2263b69
Merge branch '2.1' into 2.2
2012-06-19 18:35:36 +02:00
Ceeram
cf18e8d38b
avoid unneeded query in delete()
2012-06-19 16:08:36 +02:00
Ceeram
0df1e90eed
show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925
2012-06-18 14:20:53 +02:00
mark_story
f625742a12
Make CakeSession use httponly by default.
...
Fixes #2955
2012-06-12 22:10:55 -04:00
Kyle Robinson Young
54745aada9
Fix custom validation methods with CakeValidationSet
2012-06-11 23:28:45 -07:00
mark_story
f3464b002f
Remove duplicate code.
...
Use a shutdown function to close the session off.
This removes a bit of icky code and continues to allow
objects to be used as session handlers.
2012-06-06 21:01:16 -04:00
Jose Lorenzo Rodriguez
51635c2ca6
Merge remote-tracking branch 'origin/2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Jose Lorenzo Rodriguez
111a23274e
Fixing yet another issue related to beforeValidate and
...
validateAssociated
2012-06-06 10:07:01 -04:30
Ceeram
4c6453501e
Merge branch '2.1' into 2.2
2012-06-02 01:47:21 +02:00
Ceeram
048dc8d254
casting schema to array, fixes error for array_keys when return is null
2012-06-02 01:39:53 +02:00
Jelle Henkens
e5eb7b490e
Preventing cache collisions by adding the the datasource key
2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605
Replacing crc32 with md5 for less collisions in method caching
2012-06-01 10:42:26 +01:00
mark_story
55c4ad3c1c
Fix coding standards errors.
...
Also remove count() calls in TreeBehavior.
2012-05-31 21:20:11 -04:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
0bfcd49249
Fix unbindTranslation not unbinding.
...
There were documented use cases that have never worked. Fix that.
Also rename a method so it better describes what it does.
Fixes #2913
2012-05-27 21:25:55 -04:00
mark_story
115b2c1495
Rename joined to _joined to hopefully prevent issues.
2012-05-27 20:43:15 -04:00
Majna
ce2fc6c83d
Improve belongsTo and hasOne for unneeded queries when recursive > 1.
...
Reuse already joined data for 'belongsTo' and 'hasOne' associations instead of running unneeded queries for each record.
Fixes #47
2012-05-27 23:15:20 +02:00
mark_story
4b8c469004
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
mark_story
b27a3aab7b
Set session.gc_maxlifetime by default.
...
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings. Always set session.gc_maxlifetime so session files are
garbage collected correctly.
Fixes #2901
2012-05-23 22:25:19 -04:00
mark_story
ea9eee4c77
Fix array arguments being translated.
...
Fixes #2902
2012-05-23 21:02:41 -04:00
Jelle Henkens
ecd869d4e3
Changing int to integer
2012-05-22 16:34:07 +01:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Jose Lorenzo Rodriguez
9cceb1553f
Improving ModelValidator::add() to allow multiple rules to be defined at once
2012-05-20 18:51:00 -04:30
mark_story
16a1a0ee79
Fix coding standards.
2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64
Merge branch '2.2-validator' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
Jose Lorenzo Rodriguez
16847b0d97
Backporting changes form 2.2 to fix some edge cases on deep saving. Fixes #2879
2012-05-19 21:14:23 -04:30
Jose Lorenzo Rodriguez
dc8c731ccb
Fixed failing test case
2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6
Merge branch '2.1' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/models.php
2012-05-19 15:39:44 -04:30
Ceeram
7dbd6bc3a2
make sure model data is moved to alias, even when first key in data is assoc model
...
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
2012-05-19 14:41:16 -04:30
Jelle Henkens
dbd826f794
Removing extra space in the extract() calls
2012-05-13 10:37:50 +01:00
ADmad
eeff950cf9
Removing default null value for $data parameter. Refs GH pull request #646
2012-05-12 00:18:47 +05:30
Jose Lorenzo Rodriguez
217bf85537
Implemented new method isEmptyAllowed in CakeValidationRule
2012-05-10 23:13:45 -04:30
Jose Lorenzo Rodriguez
785cf8354c
Fixing merge artifacts to make all tests pass
2012-05-10 22:36:55 -04:30
Jose Lorenzo Rodriguez
307197da9e
Merge branch '2.2' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-05-10 22:19:35 -04:30
Jose Lorenzo Rodriguez
efc3536adb
Fixing a couple errors introduced in previous commit
2012-05-10 22:04:55 -04:30
Jose Lorenzo Rodriguez
2b7c2ad691
Fixing doc blocks for CakeValidationRule and changing visibility for some methods
2012-05-10 21:51:54 -04:30
Jose Lorenzo Rodriguez
34531d9d7c
Cahnging doc in header for CakeValidationSet
2012-05-10 21:41:42 -04:30
Jose Lorenzo Rodriguez
c4202b7b22
Improving docs for CakeValidationSet
2012-05-10 21:39:53 -04:30
Jose Lorenzo Rodriguez
8c9c6b4a5a
Improving docs for ModelValidator
2012-05-10 21:27:01 -04:30
Jose Lorenzo Rodriguez
280893155a
Renaming CakeRule to CakeValidationRule
2012-05-10 21:01:44 -04:30
Jose Lorenzo Rodriguez
f06fbb0075
Making validateAssociated overwrite data consistently with validateMany
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
82e87791f6
Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
1481f82ec1
Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
7db2b97f87
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
e4c88d8cf9
Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit 0f54758e5ab4a42e4a03
2012-05-10 20:55:47 -04:30
Jose Lorenzo Rodriguez
2cea668755
Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit b4a42e4a036bd7da36e7
2012-05-10 20:55:46 -04:30
Christian Winther
ad4e46150a
Fixing saveMany
2012-05-10 20:55:46 -04:30
Christian Winther
fbd2132300
Another fix for Pull request 642
2012-05-10 20:55:46 -04:30
Christian Winther
7a1275a1b1
Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
...
This allow changes in beforeValidate to be saved
2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-10 20:55:46 -04:30
mark_story
8334ebebed
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-10 20:55:45 -04:30
Jose Lorenzo Rodriguez
b54dc69f64
Making validateAssociated overwrite data consistently with validateMany
2012-05-10 00:52:54 -04:30
Jose Lorenzo Rodriguez
6da2fe8323
Ugly hack to fix saveAll deep and beforeValidate callbacks changing model data
2012-05-10 00:47:35 -04:30
Jose Lorenzo Rodriguez
00a34f14fe
Added warning messages in doc block for validateMany and validateAssociated about first param being passed by reference
2012-05-10 00:07:05 -04:30
Jose Lorenzo Rodriguez
0fb025f6dc
Fixing error with validateMany and validateAssociated not saving values altered in beforeValidate callbacks
2012-05-09 23:51:27 -04:30
Jose Lorenzo Rodriguez
12ae03b876
Revert "Merge pull request #644 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit 0f54758e5ab4a42e4a03
2012-05-09 17:58:08 -04:30
Jose Lorenzo Rodriguez
07bf73e88f
Revert "Merge pull request #643 from nodesagency/hotfix/beforeValidate-copy-data"
...
This reverts commit b4a42e4a036bd7da36e7
2012-05-09 17:57:48 -04:30
Christian Winther
e8fce37a65
Fixing saveMany
2012-05-09 23:59:02 +02:00
AD7six
8060dd57d3
don't dump indexes all on the same line
2012-05-09 23:38:30 +02:00
AD7six
0c4613fdd2
prevent NULL in fixture files
2012-05-09 23:38:29 +02:00
Christian Winther
3b154fa325
Another fix for Pull request 642
2012-05-09 23:34:37 +02:00
Christian Winther
45a86a8b20
Copy changes made to $this->data in beforeValidate callbacks back to saveAssociated data variable
...
This allow changes in beforeValidate to be saved
2012-05-09 22:57:21 +02:00
mark_story
fbba3621b5
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-07 21:36:28 -04:00
Jose Lorenzo Rodriguez
52c7b2383c
Added afterValidate callback to maintain consistency across all other callbacks in the model layer
2012-05-06 23:38:29 -04:30
Jose Lorenzo Rodriguez
d4511af27b
Implemented add and remove in ModelValidator
2012-05-06 23:06:28 -04:30
Jose Lorenzo Rodriguez
a7222bccd6
Implemented removeRule in CakeValidationSet
2012-05-06 22:30:07 -04:30
mark_story
6c5255ac73
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-06 22:48:15 -04:00
Jose Lorenzo Rodriguez
1ff1af35b3
Fixing typo
2012-05-06 20:45:50 -04:30
Jose Lorenzo Rodriguez
ff91a0909a
Implemented countable interface for CakeValidationSet
2012-05-06 01:07:13 -04:30
Jose Lorenzo Rodriguez
989a8b8398
Implementing IteratorAggregate for CakeValidationSet
2012-05-05 21:13:09 -04:30
Jose Lorenzo Rodriguez
6f16a66b83
Implmenting ArrayAcces in CakeValidationSet
2012-05-05 21:00:40 -04:30
Jose Lorenzo Rodriguez
877e6c0f66
Removing the need for first param in CakeRule constructor
2012-05-05 19:41:48 -04:30
Kim Egede Jakobsen
d180f6c3e5
Changed some of the doc-block links.
...
!But think there is a mistake somewhere with the links!
Camel-case or lowercase?
doc block content -> working link
(Model.php)
\#useTable -> \#usetable
\#displayField -> \#displayfield
\#cacheQueries -> \#cachequeries
\#sortByKey -> \#sortByKey (equals - basic.php)
2012-05-06 01:44:27 +02:00
Jose Lorenzo Rodriguez
3199b9029b
Implemented countable interface for ModelValidator
2012-05-05 17:46:09 -04:30
Jose Lorenzo Rodriguez
81c0c3d91d
Implementing IteratorAggregate interface for ModelValidator
2012-05-05 17:34:35 -04:30
Jose Lorenzo Rodriguez
d35f8e6b00
Implementing ArrayAccess in ModelValidator
2012-05-05 15:52:02 -04:30
Jose Lorenzo Rodriguez
b6c8a345e7
Renaming CakeField to CakeValidationSet
2012-05-05 13:44:12 -04:30
Jose Lorenzo Rodriguez
843d95bb77
Renaming some methods ands removing others
2012-05-05 13:34:14 -04:30
mark_story
128c719bd0
Add no-op method to base class.
...
Fixes #2839
2012-04-30 20:52:17 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Jose Lorenzo Rodriguez
05abff6ecd
Fixing faling test case
2012-04-29 19:58:22 -04:30
Jose Lorenzo Rodriguez
72e8992c25
Improving test coverage for CakeRule
2012-04-29 19:56:24 -04:30
Jose Lorenzo Rodriguez
d348bf6807
Refactoring again CakeRule, making all tests pass
2012-04-29 18:11:51 -04:30
Jose Lorenzo Rodriguez
94040859b2
Correctly calling method to not depend on functon call order
2012-04-29 02:57:10 -04:30
Jose Lorenzo Rodriguez
deedd7a3ce
Even more tests passing now, almost there
2012-04-29 02:40:08 -04:30
Jose Lorenzo Rodriguez
8700f3c7a2
Fixed some validation tests
2012-04-29 01:06:24 -04:30
Jose Lorenzo Rodriguez
18c26119f3
Removing redundant code, cleaning up some sentences
2012-04-29 00:39:43 -04:30
Jose Lorenzo Rodriguez
c31f87b7a1
Refactored getMethods, got rid of validationErrors property in ModelValidator, made validateAssociated and many tests
...
pass
2012-04-29 00:24:35 -04:30
Jose Lorenzo Rodriguez
b83f936e83
General refactor on ModelValidation to decrease class coupling and increase readability
2012-04-28 23:25:05 -04:30
Jose Lorenzo Rodriguez
573d292ffa
Fixed more refereces to old method
2012-04-28 20:12:20 -04:30
Jose Lorenzo Rodriguez
4519ba1221
Fixed variable reference
2012-04-28 20:05:41 -04:30
Jose Lorenzo Rodriguez
3ea2d7bca5
Removing validatior construction in model constructor
2012-04-28 20:04:33 -04:30
Jose Lorenzo Rodriguez
f54eb0cdee
following coding standards and simplifying some logic
2012-04-28 19:38:18 -04:30
Jose Lorenzo Rodriguez
8eb02d0539
Simplifying options for setting/getting a model validator. Adding loading support for validators is was simplified into
...
requiring custom validators to extend core ModelValidator
2012-04-28 19:20:22 -04:30
Tigran Gabrielyan
77f6d88a9e
Fixed bug in model validation translate
2012-04-26 21:24:22 -07:00
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
Juan Basso
333ea29805
Renamed variable name from nested transaction
2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0
Renamed method to check if the driver supports nested transaction.
2012-04-26 20:58:25 -04:00
Ceeram
ec9966ec6b
Adding tests for Validator
2012-04-25 09:38:58 +02:00
Thomas Ploch
324684c14f
Moving all validation logic into a new ModelValidator object.
2012-04-25 08:53:31 +02:00
Juan Basso
f6288a491a
Disabled the default nested configuration. MySQL use MyISAM as default and it can affect many applications.
2012-04-24 21:42:32 -04:00
Ceeram
74ee75b0ef
Merge branch '2.1' into 2.2
2012-04-23 10:34:04 +02:00
Juan Basso
7fe333ce4e
Merge branch '2.2-nested-transaction' into 2.2
2012-04-22 23:04:32 -04:00
ADmad
b1e7164d1a
Implemented translation of validation rule arguments in validation error messages. Closes #2816
2012-04-22 23:25:07 +05:30
Ceeram
f0bd7386e2
created, modified and updated fields now use static timestamp in testcases
2012-04-21 17:38:49 +02:00
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
Ceeram
388b20dd9d
fix error in previous commit
2012-04-17 00:22:13 +02:00
Ceeram
a84597784d
avoid warning when saveAll() data has empty hasMany data, fixes #2792
2012-04-16 22:46:58 +02:00
Ceeram
9556ff714d
Avoid running validation again, when saveAll() is called with 'validate' => 'first'
2012-04-16 09:45:44 +02:00
mark_story
d136fac219
Correct docs to match code.
...
Fixes #2790
2012-04-15 20:33:43 -04:00
Juan Basso
7be5349b0c
Added configuration to disable nested transaction, even if the db supports it.
2012-04-14 16:43:24 -04:00
Juan Basso
a512d46679
Sqlite is failing in PHP 5.2, re-adding the check for driver support.
2012-04-14 16:23:51 -04:00
Juan Basso
2c1cf29aa3
Added real support to nested transactions for Mysql, Postgres, Sqlite.
2012-04-14 16:21:42 -04:00
Juan Basso
2c9399a78a
Removed unused attribute and moved getVersion to be reused in all PDO drivers.
2012-04-14 16:21:41 -04:00
Mark Story
6167529d4d
Merge pull request #605 from shama/patch-datasource-test
...
Add checks for startQuote & endQuote.
Fixes #2769
2012-04-14 08:08:05 -07:00
mark_story
b9389c9da1
Fix comment's reference to version numbers.
2012-04-14 10:50:31 -04:00
mark_story
2fd15b6c7e
Revert removal of session_cache_limiter()
...
It was removed in [4a6159c9afFixes #2781
2012-04-14 10:04:56 -04:00
Kyle Robinson Young
6cf73c763c
Tests for a generic custom datasource
...
Default startQuote and endQuote to avoid error with non-database datasources
2012-04-11 10:08:45 -07:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
2333c8f33f
Re-factor duplicated code.
2012-04-10 21:05:42 -04:00
mark_story
f8966a64f2
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
Mark Story
da9cbcf7bb
Merge pull request #603 from luisarmando/queryCacheDoc
...
Fix doc of DboSource->$_queryCache.
2012-04-09 14:35:57 -07:00
Luís Armando
bb2286bc43
Fix doc of DboSource->$_queryCache.
2012-04-09 13:30:58 -03:00
mark_story
8d1b5c3f24
Fix notice errors with postgres.
2012-04-07 17:22:27 -04:00
mark_story
15c94dee4d
Fix whitespace and remove duplicate method calls.
2012-04-07 14:42:25 -04:00
mark_story
a24aca6ffc
Fix a few code standards errors.
2012-04-06 22:56:01 -04:00
Ceeram
c2a8fca00c
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
Ceeram
30268f6a08
Only check for existing method expresion() when it actually will be called.
...
Datasources that use calculate() should not be forced to implement expression() as well
2012-04-05 23:15:18 +02:00
mark_story
5c590aad09
Add missing ClassRegistry import.
...
Fixes #2757
2012-04-05 08:33:12 -04:00
Ceeram
2b7fe21ee0
remove all Set::extract() from core and tests
2012-04-05 01:33:57 +02:00
ADmad
1cc5206442
Merge branch '2.1-dbosource' into 2.1
2012-04-04 19:58:48 +05:30
ADmad
93639a7c43
Fixed bug where associated model's afterfind was not triggered in particular case
2012-04-04 19:48:37 +05:30
Ceeram
d2098828c6
Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750
2012-04-04 15:07:45 +02:00
ADmad
7ed90c72ae
Updating API docblock for Model::query()
2012-04-03 19:06:41 +05:30
mark_story
72cb96b727
Fix a few more coding standards errors.
2012-04-02 23:23:53 -04:00
Ceeram
34a730dfd8
ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709
2012-04-02 18:48:02 +02:00
mark_story
4e67698506
Fix issues with SQLServer + boolean columns.
...
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.
Fixes #2439
2012-04-01 22:10:05 -04:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
Kyle Robinson Young
e2a46f76c7
substr() optimizations
2012-03-28 13:07:26 -07:00
mark_story
a76a926ac1
Fix more uses of Set -> Hash
2012-03-26 22:32:57 -04:00
mark_story
17bfbbb9df
Port over Set to Hash usage.
2012-03-26 22:32:55 -04:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
mark_story
29048b3bb7
Update to use Hash.
...
Update CakeSession & Configure to use Hash.
2012-03-26 22:25:41 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Thomas Ploch
fda065101b
Fixed test cases for successful being built on travis.
2012-03-24 21:32:31 +01:00
dogmatic69
7c697eb9be
adding an extra check to only type cast if its a int/true/false so you can still use fields etc in the queries
2012-03-23 21:21:18 -04:00
Ceeram
817015e6b3
remove unneccesary elseif
2012-03-23 16:37:02 +01:00
Ceeram
d748fc7451
Merge branch '2.1' into 2.2
2012-03-23 16:32:04 +01:00
Ceeram
4a6159c9af
session_cache_limiter() removed, it was set to invalid value as well
...
Also remove setting P3P header
2012-03-23 16:31:26 +01:00
Kyle Robinson Young
21c4967cc6
App::uses the File Utility as write() uses File
2012-03-22 23:48:57 -07:00
mark_story
20bdf1d7b0
Add escaping to table names.
...
SQLite was not quoting table names, so tables with
keywords caused errors.
Fixes #2702
2012-03-21 21:04:34 -04:00
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
Ceeram
4dfbfe9c8b
fix saveAll deep option, when associated data is empty, or has deeper associated model data as first key in array
2012-03-21 10:38:04 +01:00
mark_story
01e035f726
Move logic to afterDelete.
...
Because behavior callbacks are fired first, removing data in the
beforeDelete could result in data loss if the model prevents deletion.
Fixes #2699
2012-03-20 22:36:48 -04:00
Mark Story
3abb7d966b
Merge pull request #569 from tPl0ch/2.2-datasource-close
...
Adding basic implementation of DataSource::close().
2012-03-20 18:06:00 -07:00
Ceeram
091ad53b80
ensure boolean values are converted to correct value on update, avoiding issues with posgres boolean type
2012-03-19 13:27:26 +01:00
mark_story
c58b61c17b
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
ADmad
bdddc85946
Making option 'unique' => 'keepExisting' for HABTM association behave consistently with all acceptable data formats.
2012-03-18 13:43:21 +05:30
mark_story
544930f882
Skip validation when recovering trees.
...
Fixes #2663
2012-03-16 21:57:20 -04:00
Thomas Ploch
a06eba7e24
Adding basic implementation of DataSource::close().
...
Since this method will be called in Destructor.
2012-03-16 21:08:48 +01:00
dogmatic69
2ad0f8b8db
setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779
2012-03-13 17:40:25 +00:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
5687d97a98
Merge branch '2.1' into 2.2
2012-03-12 20:31:33 -04:00
Simon Males
791cc1a657
array_merge inappropriate for certain column types. e.g. Switching from VARCHAR(45) to DATETIME will carry length, collate and charset properties
2012-03-12 21:30:52 +11:00
Ceeram
a4952166f7
make acl methods available in permission model
2012-03-11 17:07:42 +01:00
mark_story
8c611b236d
Fixing missed cache reads for table schema.
...
Because cache keys were different, model schema would not be read from
the cache. Make keys used consistent.
Fixes #2670
2012-03-11 10:24:05 -04:00
Ceeram
bbfaa9e947
Paginating now work well with custom find methods.
...
_findCount() will now pass $query['operation'] = 'count' for more flexibility.
Custom finders can distinguish the operation and return other $query if needed.
2012-03-11 15:14:50 +01:00
mark_story
83a29f054e
Fix Session.cookieTimeout default behavior.
...
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.
Fixes #2669
2012-03-11 08:14:54 -04:00
mark_story
664b0538b8
Fix more coding standards problems.
2012-03-04 22:49:38 -05:00
mark_story
9a6ad7e1e2
Fixing most coding standard issues in Model/
2012-03-04 21:51:50 -05:00
Ceeram
08a4d0bf63
Avoid unsetting Model's $findMethods when defining a custom find method in AppModel, also add tests for custom finds
2012-03-03 23:55:03 +01:00
ADmad
12364cac8c
Fixed indentation
2012-02-28 02:04:43 +05:30
mark_story
0568746bfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
faeb7b4536
Fix error creating schema files.
...
If you removed app/Config/Schema and tried to create
schema files, you'd get an error instead of a file.
Fixes #2618
2012-02-26 10:25:39 -05:00
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
euromark
45112088a1
type hinting models
2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e
visibility attributes
2012-02-25 19:46:06 -05:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
ADmad
4edb378ef8
Added ability to pass ID as parameter to Model::exists()
2012-02-24 19:42:23 +05:30
Mark Story
94db313e39
Merge pull request #516 from dogmatic69/tree-behavior-optimization
...
Tree behavior optimization
Fixes #2600
2012-02-23 09:27:41 -08:00
dogmatic69
c02912261b
setting recursive to -1
2012-02-23 11:36:44 +00:00
Rachman Chavik
c6449f649f
adding missing ','
2012-02-23 09:08:17 +07:00
Rachman Chavik
b545d8b201
fix getSchemaName() for Sqlserver.
...
Closes #2609 .
2012-02-23 08:25:07 +07:00
dogmatic69
74a84c96f1
optimization of tree behavior as per ticket #2600
2012-02-23 00:56:20 +00:00
Mark Story
b7302850b5
Merge pull request #467 from tPl0ch/2.1-required-update-create
...
Added support for simplified required validation on 'create' or 'update'. Fixes #230 .
2012-02-22 09:43:13 -08:00
mark_story
2097d5a968
Fix duplicate items in HABTM associations.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues where nested
HABTM associations would create duplicate content.
Fixes #2564
Fixes #1598
2012-02-17 21:10:14 -05:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
Ceeram
ee54daef35
AclNode now throws exception instead of trigger_error
2012-02-20 15:41:57 +01:00
mark_story
89b9bb7297
Fix duplicate items in HABTM associations.
...
Apply patch from 'Kim Biesbjerg'. Fixes issues where nested
HABTM associations would create duplicate content.
Fixes #2564
Fixes #1598
2012-02-17 21:09:48 -05:00
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
Majna
1dbafe1d4f
Fix docblocks.
2012-02-17 13:51:20 +01:00
dogmatic69
3246cf7c1e
adding the model alias so that there are no issues when the find has a join on it
2012-02-16 16:22:45 +00:00
Ceeram
bc07ba3839
Added option['deep'] to saveAll, to save unlimited levels associated data
...
Squashed commit of the following:
commit 45caa54e3b25bc94ee10d7b3700ff334e7994257
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 22:29:33 2012 +0100
update docblocks for deep save
commit 6f3c3b9abf12e394262b0a233188a52095f64b50
Merge: 1d32698 1dd0ff12afb05b95aa7e34f1be12
2012-02-13 01:00:28 +01:00
ADmad
1dd0ff1701
Updating docblock
2012-02-12 22:11:55 +05:30
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Ceeram
2897c72215
AclNode now extends Model, to avoid infinite loop when attaching AclBehavior to AppModel
...
Conflicts:
lib/Cake/Model/AclNode.php
lib/Cake/Model/Aco.php
lib/Cake/Model/Aro.php
2012-02-10 23:38:40 +01:00
mark_story
9c1fa28d60
Its EXECUTE not EXECUCUTE
...
Also make the search insensitive as casing bugs are no fun.
2012-02-10 12:43:07 -05:00
mark_story
0cfec525b2
Allow SqlServer to execute procs correctly.
...
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.
Fixes #2558
2012-02-09 22:27:30 -05:00
Yasushi Ichikawa
e8a9d93eb5
Add params option to logQuery()
...
Parameters for prepared statements are now part of the
logged query data.
2012-02-08 20:15:40 -05:00
Thomas Ploch
07b16987a3
Fixed strict checking of 'required' attributes.
2012-02-07 15:31:27 +01:00
Thomas Ploch
4f3b266491
Added support for simplified required validation on 'create' or 'update'. Added testcases for new 'required' attributes and conflicts with the 'on' key. Fixes #230 .
2012-02-07 12:15:04 +01:00
mark_story
4bb4040851
Check method existence before calling.
...
Datasource does not implemente calculate() or
expression(). Only call them if they exist.
Fixes #2535
2012-02-05 12:54:20 -05:00
mark_story
ace9fefb02
Merge branch '2.0' into 2.1
2012-02-03 21:54:50 -05:00
mark_story
49a48ced89
Don't restrict to BASE_TABLE.
...
This allows Views, and custom table types
to be connected to models in SqlServer.
Fixes #2529
2012-02-03 21:54:26 -05:00
Shadow6363
62e671f6b8
Changed MySQL in comment to SQLite.
2012-02-03 21:03:34 -05:00
mark_story
a275555297
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/CakeSession.php
2012-01-29 15:38:56 -05:00
