Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
mark_story
3cb501f1c5
Fix issue created in [ e8b5d81fd7
]
...
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.
Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
e8b5d81fd7
Fix quoting of field names containing -
.
...
Fixes #3165
2012-08-31 14:25:02 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
d4ee62be61
Add support for biginteger on SQLserver.
2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d
Add bigint support for Sqlite.
...
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e
Add bigint support for postgres
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
68116f7017
BIGINTs can also be primary keys
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
15555a7309
added schema support for mysql bigints
2012-08-30 14:48:59 +01:00
Jose Lorenzo Rodriguez
f6278488af
Ensuring list of behavior methods are refreshed between calls of
...
validates() in the model, fixes #3071
2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf
Fixing issues with validation rules not being reset after calling
...
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
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 fa5aa6278f
, reversing
changes made to 88604ac757
.
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 [1c0b6c076a
]
associated translations would incorrectly be saved with a value of ''.
Fixes #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 0f54758e5a
, reversing
changes made to b4a42e4a03
.
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 b4a42e4a03
, reversing
changes made to 6bd7da36e7
.
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 0f54758e5a
, reversing
changes made to b4a42e4a03
.
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 b4a42e4a03
, reversing
changes made to 6bd7da36e7
.
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 [4a6159c9af
].
The session_cache_limiter() is required for IE8 to correctly
hold onto sessions.
Fixes #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 1dd0ff1
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 18:17:34 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit 1d32698640fa1a3c1d606eeaf4740637ff8a1991
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 18:16:57 2012 +0100
Revert "adding info in docblock about associated model fieldList"
This reverts commit 7cc10a2b5afc1007c388a6da449781dc351d50cd.
commit 7cc10a2b5afc1007c388a6da449781dc351d50cd
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 18:05:18 2012 +0100
adding info in docblock about associated model fieldList
commit db2ad2759f6af460715a8bbee167262bcbb62d77
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 17:51:44 2012 +0100
add tests for deep saveAll respecting fieldList option
commit 14123fccfc43fac1b4cddeea8350dca8fb9c9821
Merge: cfdf25d 2afb05b
Author: Ceeram <c33ram@gmail.com>
Date: Sun Feb 12 16:51:26 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit cfdf25d4b587c6f1a8cd6ec2bc46dc21fa3c6704
Author: Ceeram <c33ram@gmail.com>
Date: Tue Feb 7 13:54:59 2012 +0100
Make saveAllTheThings fully BC, use $options['deep'] = true, to save infinite recursive data
commit 6e8c4380c37a31efc2a37a5ab6438db26d293eb3
Merge: 203c7e1 95aa7e3
Author: Ceeram <c33ram@gmail.com>
Date: Wed Jan 25 14:22:26 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit 203c7e1d9870e282ec7098297d47e49132904401
Author: Ceeram <c33ram@gmail.com>
Date: Wed Jan 25 14:19:25 2012 +0100
validate all the things as well
commit d920d0000fcab80fc48a29b45dbba147a2eed27c
Merge: d648f6a 4f1be12
Author: Ceeram <c33ram@gmail.com>
Date: Mon Jan 23 18:22:12 2012 +0100
Merge branch '2.1' into 2.1-saveAllTheThings
commit d648f6a90419e0fa27ed1d9e9feb51c37fbf0397
Author: Ceeram <c33ram@gmail.com>
Date: Fri Dec 9 15:11:52 2011 +0100
making saveAll, saveMany and saveAssociated not limited to only save directly related models
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
mark_story
4dd13ef554
Fix issue where session would always be regenerated.
...
Fixes #2519
2012-01-29 15:37:14 -05:00
mark_story
b9053161f4
Split I18nModel into a separate file.
...
Refs #2514
2012-01-29 13:28:08 -05:00
ADmad
ca32ca185a
Fixing API docblock
2012-01-29 22:24:26 +05:30
mark_story
d904ab00fa
Merge branch '2.0' into 2.1
2012-01-27 20:58:24 -05:00
Ceeram
fb3c3e4df8
fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464
2012-01-27 00:16:22 +01:00
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
Ceeram
6d69ec3a78
update book link
2012-01-25 10:12:59 +01:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
Jose Lorenzo Rodriguez
37314a2188
Logging transaction commands in DboSource, fixes #2457
2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52
Preventing datasource creationa and access on models having $useTable = false;
2012-01-21 14:03:11 -04:30
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Ceeram
d4e2fbf6b8
set correct default validate option, now matches saveAll/saveMany default value, fixes #2492
2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3
Merge changes from 1.3 to 2.0
...
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
2012-01-19 22:50:40 -05:00
mark_story
eb101b9eb8
Update Model::saveAssociated() documentation
...
Fixes #2492
2012-01-19 21:10:46 -05:00
Ceeram
2a9e6771c3
allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769
2012-01-19 23:26:43 +01:00
AD7six
b62d9729a9
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab
Merge branch 'feature/set-nest' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
2012-01-19 10:51:09 +01:00
Scott Harwell
e1738c8c4a
Added check for NOT in key when array count === 1 to prevent SQL error
2012-01-18 15:04:53 -05:00
Majna
d2dd861417
Update doc block for 'keepExisting' HABTM option.
2012-01-17 22:02:30 +01:00
Majna
e947df36a5
Remove unnecessary condition in Model::getID().
2012-01-17 21:57:40 +01:00
Majna
826374e57c
Remove unnecessary param when calling begin, commit and rollback on datasource.
2012-01-17 21:52:22 +01:00
Jose Lorenzo Rodriguez
e25867da79
Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP
2012-01-12 20:12:38 -04:30
mark_story
97ce118294
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
Victor Yap
cf8c1cd93b
Return length 36 for uuid columns in Postgres.describe()
...
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.
Fixes #2467
2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7
Replace smart quotes with ASCII equivalents.
...
Fixes #2466
2012-01-11 13:38:50 -05:00
mark_story
aeda986745
Add additional empty() for tablePrefix.
...
Fixes compatibility issues with plugins that worked correctly in
previous point releases.
Fixes #2462
2012-01-10 21:01:03 -05:00
mark_story
a8bc916104
Move check out of the loop, and allow nulls.
...
Refs #2341
2012-01-10 20:15:59 -05:00
AD7six
5608d63541
allow set nest to work with any-d arrays
...
not just model-formatted arrays
2012-01-10 01:24:20 +01:00
AD7six
442d889f99
move the paths used into options
2012-01-10 00:48:36 +01:00
AD7six
7b640b8123
move find threaded logic to the set class
2012-01-10 00:24:38 +01:00
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
3c48552f81
Fix error with more case-sensitive databases.
2012-01-08 21:40:12 -05:00
mark_story
c548b6b88a
Fix issue with find(count) and translated conditions.
...
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.
Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.
Fixes #2349
2012-01-08 20:40:25 -05:00
Jose Lorenzo Rodriguez
850dbb9453
More explicit fetch mode in Mysql datasource
2012-01-08 18:46:42 -04:30
Jose Lorenzo Rodriguez
67d18b0c59
Making sure the Validation class exists before checking methods on it
2012-01-07 18:33:24 -04:30
Jose Lorenzo Rodriguez
7b586369e0
Initializing CakeSession class only when required, mixing procedural code with class definitions is not good
2012-01-07 18:31:50 -04:30
Jose Lorenzo Rodriguez
399c293b77
Extracting the CakeSessionHandlerInterface into its own file
2012-01-07 18:20:16 -04:30
Jose Lorenzo Rodriguez
e5c312f4b5
Using an explicit fetch mode in all calls to PDOStatement::fetch, this also reduces the memory usage
2012-01-07 18:06:02 -04:30
mark_story
beced84d2d
Fix illegal offset caused by TranslateBehavior.
...
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.
Fixes #2443
2012-01-07 11:58:35 -05:00
Jose Lorenzo Rodriguez
ba097d404f
Explicitly using a fetch mode in SQLServer, not doing it causes serious memory leaks
2012-01-07 01:04:02 -04:30
Jose Lorenzo Rodriguez
cd562f52ba
Fixing a couple failing tests on windows using sqlserver
2012-01-07 00:37:50 -04:30
José Lorenzo Rodríguez
f9c8d0cbf9
Merge pull request #394 from majna/2.0-sess-doc
...
Remove unused property CakeSession::$security.
2012-01-04 16:20:24 -08:00
Majna
75b4e7d550
Remove unused property CakeSession::$security.
2012-01-04 22:09:40 +01:00
José Lorenzo Rodríguez
3589eaebcf
Merge pull request #393 from majna/2.0-sess-doc
...
Fix incorrect doc block in CakeSession.
2012-01-04 12:49:36 -08:00
Majna
ba02cf7a9a
Fix incorrect doc block in CakeSession.
2012-01-04 21:40:14 +01:00
mark_story
9562638610
Merge branch '2.0' into 2.1
2012-01-04 07:39:35 -05:00
mark_story
c43b099894
Fix null bytea columns.
...
Apply patch from 'opiazer' Fixes #2432
2012-01-03 20:51:56 -05:00
mark_story
101148c10f
Return 0 if there is no result.
...
The documented return is an integer. Stick to that.
Fixes #2430
2012-01-02 20:18:01 -05:00
mark_story
b4faa00703
Adding error to find(threaded).
...
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.
Fixes #2341
2012-01-02 13:46:35 -05:00
mark_story
83987bee17
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
mark_story
c3e9a931d6
Should have been association name, not field name.
2011-12-30 20:54:26 -05:00
mark_story
b5f918765e
Adding docs + exceptions for name translation.
...
Closes #2367
2011-12-30 20:39:04 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Rachman Chavik
1d333fd8b7
fullTableName needs to check for empty schemaName
2011-12-29 19:18:37 +07:00
Jose Lorenzo Rodriguez
6ac3b10a5e
Making beforeDelete trigger first on behaviors and then in model
2011-12-27 22:49:50 -04:30
Jose Lorenzo Rodriguez
33705f24bf
returning the correct query in beforeFind in case callbacks return true
2011-12-26 13:38:04 -04:30
Jose Lorenzo Rodriguez
1651257919
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
2011-12-26 13:06:48 -04:30
Mark Story
0750069126
Remove pointless condition.
2011-12-26 11:56:44 -05:00
mark_story
d8bc13f996
Fix incorrect time handling in deconstruct()
...
Apply patch from 'Amit Badkas' to solve issues where invalid times
were treated as valid.
Re-structure tests to use a dataprovider instead of copy + paste.
Fixes #2412
2011-12-26 10:03:14 -05:00
ADmad
ba27c8c201
Added multi-model fieldList support
2011-12-23 02:07:48 +05:30
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
euromark
a41539dfa4
Indentation fix (tab instead of spaces)
...
Fixes #2398
Conflicts:
lib/Cake/Test/Case/Console/Command/ShellTest.php
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-20 22:26:43 -05:00
Fitorec
e7c913acba
Fix unreachable code in Model mergeVars
...
Squashed commit of the following:
commit c8326460a4
Author: Fitorec <chanerec@gmail.com>
Date: Tue Dec 6 18:04:11 2011 -0600
add a space after the comma in the $merge array
commit 22ad6cdca5
Author: Fitorec <chanerec@gmail.com>
Date: Tue Dec 6 03:31:54 2011 -0600
removing the condition and adding actsAs to the default list of merged keys.
commit afa4dd0dee
Author: Fitorec <chanerec@gmail.com>
Date: Mon Dec 5 12:10:32 2011 -0600
Solving the small defect in the array of behaviors(actsAs)
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-18 10:38:17 -05:00
ADmad
248a2d3f26
Adding missing Model::create() when using Model::save() in a loop. Fixing some code formatting. Fixes #848
2011-12-18 03:55:14 +05:30
Kyle Robinson Young
d794084d38
More code standards formatting
2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Rachman Chavik
577225b8a6
include schema name when storing in _sequenceMap
2011-12-15 13:49:48 +07:00
euromark
9d6ea57c30
Fix missing App::uses() added
...
Fixes #2374
Signed-off-by: mark_story <mark@mark-story.com>
2011-12-14 08:08:35 -05:00
Mark Story
102b96f25c
Merge pull request #377 from shama/2.0
...
Fix typo on TranslateBehavior error message
2011-12-14 05:04:00 -08:00
Rachman Chavik
a8d0447e61
fix fullTableName duplicate prefix, closes #2355
2011-12-14 14:35:20 +07:00
Rachman Chavik
d2eac08e6b
fixing previous incomplete fix
2011-12-14 14:34:41 +07:00
Kyle Robinson Young
e6e0027ec7
Fix typo on TranslateBehavior error message
2011-12-13 22:28:55 -08:00
Kyle Robinson Young
060e225b76
Add test for Model::getID(), simplify return and remove dated @see link
2011-12-13 22:19:50 -08:00
Rachman Chavik
6505dd8e29
fixing conflict resolution in 2e8498e1
re: pgsql
2011-12-14 07:50:44 +07:00
Rachman Chavik
90af608489
keep existing data in unique HABTM closes LH 275
...
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
mark_story
c3f17c24f3
Fix issue with duplicate prefixes.
...
Postgres::truncate() was double prefixing
table names.
Fixes #2355
2011-12-09 21:14:57 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
Jose Lorenzo Rodriguez
73aeb6ba62
Lazy-loading the $tablePrefix property in models, Fixes #2277
2011-12-08 00:10:22 -04:30
mark_story
bc8ae11fc1
Fix fatal error with abstract/interface classes
...
Abstract/Interface classes + ClassRegistry::init() should
raise an exception, not cause fatal errors.
Update CakeSchema to swallow and ignore any exceptions coming from
ClassRegistry.
Fixes #2328
2011-12-07 20:58:01 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08:00
mark_story
0670b96c24
Fix issue with incorrect date handling.
...
Fixes #2321
2011-12-03 14:38:55 -05:00
mark_story
6d269ce25d
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Command/TestsuiteShell.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Model/Datasource/Database/Sqlite.php
lib/Cake/Test/Case/Model/ModelTestBase.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
49708ec837
Fix cachefiles being generated with "
...
Cache files with SQLite should not contain "
Fixes #2323
2011-11-30 21:56:25 -05:00
mark_story
65b87af6c0
Adding set to autoloader.
...
Fixes #2319
2011-11-30 21:14:39 -05:00
Ceeram
b5c4b85601
Fixing cascading delete, when using foreignKey false and setting condition on hasOne.
2011-11-30 20:02:36 +01:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
mark_story
992a1554e1
Fix incorrect alias/name usage.
...
Fixes #2317
2011-11-29 20:44:30 -05:00
Jose Lorenzo Rodriguez
76e334ca38
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-28 22:30:36 -04:30
Jose Lorenzo Rodriguez
2bffd4c26d
Preventing memory leak in PDO when retrieving results from the driver, fixes #2293
2011-11-25 13:36:14 -04:30
Rachman Chavik
813ecb6348
set schemaName for joinTable object in TranslateBehavior
2011-11-25 22:29:23 +07:00
Rachman Chavik
fd07b961d4
Use the correct datasource when saving multiple model
2011-11-25 22:29:23 +07:00
Rachman Chavik
144b556d1f
Adding new property Model::schemaName
...
Just like physical table name, the schema name is an important information
that should be available in models. The property will be populated accordingly
by the model's datasource.
2011-11-25 22:29:23 +07:00
Rachman Chavik
fa80be50eb
Removing timestamp lines from generated files
...
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
m
58a2ee064c
CakeSchema updated for 2.0
...
Converting var to public.
Fixes #2276
Signed-off-by: mark_story <mark@mark-story.com>
2011-11-20 22:44:52 -05:00
AD7six
ac8e1e8304
allow creating models without the table existing
...
particularly useful/appropriate for schemaless datasources
2011-11-19 23:51:39 +01:00
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
Rachman Chavik
408e785d5e
Display datasource name in exceptions and error page.
...
When working with multiple databases, it's helpful to display
the datasource name that is requested by a given model.
2011-11-17 11:24:45 +07:00
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
Ceeram
e5c8a446d6
Add sorting on joined model virtual field, fixes #2250
2011-11-17 00:18:12 +01:00
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
0a0a09920b
Updating for PHP5.4
...
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
Ceeram
d8194a5818
Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0
2011-11-12 18:09:58 +01:00
ADmad
f2a58117ca
Moving AppModel, AppController, PagesController out of core to app
2011-11-12 22:30:42 +05:30
mark_story
0b0d180aad
Changing how insertMulti handles boolean values.
...
Binding values individually allows boolean to work correctly.
2011-11-09 22:31:06 -05:00
teddyzeenny
bdbc34bbed
Remove session.save_handler from php ini array
2011-11-09 16:40:32 +02:00
mark_story
2c91f119cb
Remove redundant check.
2011-11-07 23:17:08 -05:00
mark_story
15753ab641
Apply patch from 'Carlos Gant'
...
Remove un-necessary loop when deleting without cascade.
Fixes #2050
2011-11-05 16:16:13 -04:00
Jose Lorenzo Rodriguez
b983aa9192
Small optimization in DboSource
2011-11-04 10:01:45 -04:30
mark_story
f531e7f24b
Fix UUID issue in SQLite
...
Only varchar(36) was interpreted as a uuid. char(36)
should also be treated this way. Most documentation refers
to this type. Also char(x) fields should be treated as strings,
not text.
Fixes #2184
2011-10-31 23:10:48 -04:00
mark_story
43df8d34e7
Use String::tokenize() to split up fields.
...
It is slightly more intelligent than explode()
Solves basic problems in Sqlite with virtualFields.
Fixes #2163
2011-10-26 21:17:20 -04:00
ADmad
1244656595
Prevent unneeded afterFind callback triggering on associated models. Fixes #2057
2011-10-26 19:36:32 +05:30
fiblan
9c4a9bbd06
Fix missing prefix when reading table schema.
...
When using prefixes, table metadata would be lost.
Fixes #1522
Signed-off-by: mark_story <mark@mark-story.com>
Conflicts:
lib/Cake/Model/CakeSchema.php
2011-10-24 20:40:47 -04:00
mark_story
fe9e595913
Fix issue with postgres and virtualFields
...
If a virtualField was set to a literal value it would be quoted.
Test added.
Fixes #2085
2011-10-21 22:17:48 -04:00
Ceeram
2890e6659e
Fixing execute() $this->_result was not instance of PDOStatement after queries other then SELECT, lastAffected() now returns correct integer
2011-10-20 14:27:48 +02:00
Rachman Chavik
a02fd82db2
display offending model and column
2011-10-20 07:07:42 +07:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
mark_story
3e17fee237
Fix error created in merge with 1.3
2011-10-16 18:58:59 -04:00
Jose Lorenzo Rodriguez
7c5352a6c2
Merge branch 'master' into 2.0
...
Conflicts:
cake/libs/controller/components/request_handler.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
cake/tests/cases/libs/view/view.test.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/cake
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/VERSION.txt
2011-10-16 17:56:22 -04:30
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
Renan Gonçalves
229bf8e984
Keeping BC on short syntax for Acl and Tree behavior.
2011-10-16 12:06:41 +02:00
Renan Gonçalves
3a04bb4733
Dropping short syntax support for Behavior configuration.
...
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
2011-10-15 20:52:41 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Jose Lorenzo Rodriguez
d1a530f53b
Fixing all @link annotations in model class
2011-10-15 12:34:31 -04:30
Jose Lorenzo Rodriguez
d406889b14
changing @link in containable behavior
2011-10-15 11:47:10 -04:30
Jose Lorenzo Rodriguez
91d0a081fb
Fixing more links in doc blocks
2011-10-15 11:38:49 -04:30
mark_story
6d9b709c7a
Fix method signatures of database drivers.
...
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.
Fixes #2100
2011-10-14 21:25:14 -04:00
Gonçalo Marrafa
4adc042882
Fix association lazy-loading when used with ContainableBehavior
2011-10-14 17:53:37 -04:30
Majna
a5220fa7bb
Fixed doc block comments.
2011-10-11 00:22:23 +02:00
mark_story
455787ade9
Fixing undefined variable reference.
...
Fixes #2078
2011-10-09 22:34:59 -04:00
Thomas Ploch
d9cd69ac6e
Removed unnessecary call to array_merge() in Model::_deleteLinks(). Fixes #2075 .
2011-10-07 15:03:05 +02:00
Jose Lorenzo Rodriguez
c56797a15f
Adding destructor in CacheSession handler to avoid a fatal error when closing the session
2011-10-06 23:10:13 -04:30
Jose Lorenzo Rodriguez
a14abd6281
Fixing DatabaseSession handler to correctly close the session before the model object is destroyed by php.
...
This allows to remove an old hack in ConnectionManager
2011-10-06 23:01:49 -04:30
kaz29
5eb4c5c6da
Fixing bug in getEncoding/setEncoding for PostgreSQL.
...
Fixes #2028
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
055224ef68
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/libs/controller/controller.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/lib/cake_test_suite_dispatcher.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/DataSource.php
lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
mark_story
a853c0f93a
Fix another typo.
2011-10-05 22:03:18 -04:00
mark_story
c11c5c5719
Fix typo in doc block.
2011-10-05 22:02:15 -04:00
mark_story
c9bd97309f
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Jose Lorenzo Rodriguez
61be5b1d5c
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-01 14:08:56 -04:30
Jose Lorenzo Rodriguez
b8aa000589
Re-implementing Mysql::listDetailedSources() to not use prepared statements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times.
2011-10-01 14:06:41 -04:30
mark_story
af4b0c9c1b
Make DboSource::lastError() fallback to the connection.
...
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError(). Mocking PDO is a pain.
Fixes #2046
2011-09-30 21:56:39 -04:00
Jose Lorenzo Rodriguez
705593908b
Fixing some @package declarations
2011-09-30 13:17:12 -04:30
mark_story
a3f25ee5e3
Fixing issue with integer columns and NULL values.
...
Fixes #2037
2011-09-29 20:28:52 -04:00
Jose Lorenzo Rodriguez
6b7c752478
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-28 21:23:43 -04:30
Jose Lorenzo Rodriguez
df2ef0e4f1
Bringing the SQlserver datasource up to date, fixing a doc block
2011-09-28 21:23:06 -04:30
Majna
681207e327
Fixed doc block comments.
2011-09-28 22:33:46 +02:00
ADmad
33030a4502
Fixing my previous attempt in ef4826e
to make Model::_findCount() behave nicely with 'group' option. Refs #1677 , #573
2011-09-28 02:58:48 +05:30
mark_story
6008e0e8a0
Adding quoting around SET NAMES.
...
Fixes #2028
2011-09-26 21:46:16 -04:00
mark_story
8d43764801
Fix issue with duplicate associations when using string form.
...
Fixes #2002
2011-09-18 12:26:59 -04:00
mark_story
6a4e7558fc
Merge branch '1.3' into merger
...
Conflicts:
cake/basics.php
cake/console/libs/tasks/extract.php
cake/libs/view/helpers/js.php
cake/tests/cases/console/libs/tasks/extract.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/test_app/views/pages/extract.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Model/Behavior/ContainableBehavior.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
lib/Cake/Test/Case/Model/CakeSchemaTest.php
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
Renan Gonçalves
4378bb6dc4
Fixed bug in CakeSchema where it determines the field position.
...
- Respective tests were added.
- Schema files will now have 'after' => 'previous_field' on it.
2011-09-16 15:28:28 +02:00
ADmad
7c87e9abc1
For MySQL you can now specify the socket to use using unix_socket
key in the config array. Closes #1994
2011-09-16 13:40:04 +05:30
ADmad
97a975c6c4
Refactoring Model::invalidFields() a bit.
2011-09-12 05:10:34 +05:30
Jose Lorenzo Rodriguez
3d0af8b690
Adding a new exception renderer method to show useful error for failed queries
2011-09-04 04:50:19 -04:30
mark_story
2c21fc90fb
Fixing failing tests and issues with Sqlite.
2011-09-03 22:07:45 +01:00
Jose Lorenzo Rodriguez
d24c408537
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-03 14:31:02 -04:30
mark_story
4172eac7c6
Removing trigger_warning() that causes tests to fail in Sqlite, as
...
it does not assign lengths for integer columns.
2011-09-03 18:59:23 +01:00
Jose Lorenzo Rodriguez
49b8b24ac2
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-03 13:09:04 -04:30
mark_story
2ceea79862
Fixing errors and failing tests with SQLite.
...
Seems that MySQL is extremely permissive with NOT NULL fields.
SQLite is more strict it seems.
2011-09-03 18:37:29 +01:00
Jose Lorenzo Rodriguez
36470f4a86
Removing $error property from DboSource, errors in queries will throw exceptions now
2011-09-03 12:17:00 -04:30
mark_story
cc8d44f21f
Adding an exception for when a PDO interface is not installed.
2011-09-03 17:03:31 +01:00
Jose Lorenzo Rodriguez
783b5d4d1c
Fixing fatal errors when running postgres
2011-09-03 11:27:58 -04:30
Jose Lorenzo Rodriguez
89b1e54071
Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version
2011-09-03 06:50:19 -04:30
Mark Story mark@mark-story.com
8ce6c31708
Adding extra information about DboSource::fetchAll() and result caching.
2011-08-31 22:52:33 +01:00
Juan Basso
f7f3515135
Fixed documentation to methods that use func_get_args().
2011-08-21 21:45:34 -04:00
Juan Basso
e9390985ca
Changed mergeAssociation scrubQueryData to be protected.
2011-08-21 21:27:35 -04:00
Juan Basso
a1a049c700
Merge remote-tracking branch 'origin/2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/View/Helper/CacheHelper.php
2011-08-20 01:47:27 -04:00
Juan Basso
61833294f0
Changed the visibility to methods that not affect others classes.
2011-08-20 01:39:30 -04:00
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
0575e92833
Added visibility in some methods and attributes.
2011-08-18 22:30:28 -04:00
ADmad
c3884f407f
Implemented feature to allow multiple counter caches per associated model.
2011-08-17 18:10:32 +05:30
Mark Story
54e1de9070
Adding visibility keywords to code that came from
...
a 1.3 merge.
2011-08-16 22:40:38 -04:00
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
ADmad
2b342d96d6
Optimizing various finds when deleting records and updating counter cache to avoid extra queries, unnecessary joins and callbacks triggering
2011-08-15 11:47:52 +05:30
Juan Basso
7581db2cf2
More API description/examples to relations variables.
2011-08-15 01:10:32 -04:00
Juan Basso
0fcf6f6a1d
Updating some sentenses.
2011-08-15 00:35:20 -04:00
Juan Basso
725e512839
Description to some attributes in Model.
2011-08-15 00:17:40 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/security.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
lib/Cake/Test/Case/Utility/SetTest.php
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
ADmad
ef4826eb70
Making Model::find('count') behave nicely when 'group' key is specified in options. Closes #1677
2011-08-14 07:37:23 +05:30
ADmad
7983b4109b
Data returned by Model::save() not contains primary key too when new record is created. Closes #1869
2011-08-14 02:56:08 +05:30
Maggion Emmanuel
7ab1805bd9
Adding cake_dev
domain
2011-08-09 13:03:32 +03:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
4df585e15e
Changed method API description.
2011-07-31 20:33:09 -04:00
Juan Basso
7604763888
Updated some file headers to include correct license and copyright.
2011-07-31 19:14:36 -04:00
Juan Basso
ebb70c4810
Fixed type to parameters that is defined in the code.
2011-07-31 18:03:28 -04:00
Juan Basso
2a50a1ea99
Included @var in API that was missing.
2011-07-31 17:05:20 -04:00
Juan Basso
fedadc091c
Included @throws in API that was missing.
2011-07-31 16:55:52 -04:00
ADmad
9577fb0ca2
Fixed TreeBehavior::childCount(). Closes #1833
2011-07-31 12:39:52 +05:30
ADmad
b15c77ecc3
Enhancing validation messages to have placeholders. Closes #1855
2011-07-31 06:33:56 +05:30
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Juan Basso
e4a1816557
Changed the signature of methods to avoid strict messages.
2011-07-30 19:17:20 -04:00
Juan Basso
39b4032820
Fixed some API doc in model.
2011-07-30 18:38:57 -04:00
Jose Lorenzo Rodriguez
8c60e01235
Reverting change done to validation that was duplicating the validates() process for the main model, returning the correct value in validateAssociated() instead
2011-07-26 10:05:16 -04:30
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
1c7f181b9f
Making saveAll with validate => only validate the current model data first
2011-07-25 23:23:26 -04:30
Ceeram
b8daa99cac
Splitting saveAll into separate save and validation methods for many rows and associated rows. Closes ticket #1157
2011-07-25 09:39:03 +02:00
Jose Lorenzo Rodriguez
50d4330487
Ensuring uniqueness of method cache keys, all tests passing now
2011-07-17 23:45:22 -04:30
Jose Lorenzo Rodriguez
03dac31930
Using the static property instead
2011-07-17 22:41:12 -04:30
Jose Lorenzo Rodriguez
a786f4b1c6
Making DboSource::$methodCache a static variable to be able to share the cache between multiple instances of the same class
2011-07-17 22:26:21 -04:30
Jose Lorenzo Rodriguez
58282c3934
Micro optimization on Mysql source
2011-07-17 19:23:15 -04:30
Jose Lorenzo Rodriguez
762ebd4b93
Implementing a persitent method cache for DboSource, using a stronger hashing algorithm to ensure unique keys
2011-07-17 19:08:23 -04:30
Jose Lorenzo Rodriguez
ca0a7e4271
Removing method cache from DboSource::conditions() this was consuming too much memory and bringing little to no performance increase
2011-07-17 17:44:12 -04:30
Jose Lorenzo Rodriguez
b603232aee
Removing redundant call to DboSource::fields(), the fields come already quoted from DboSource::read()
2011-07-17 17:42:47 -04:30
Jose Lorenzo Rodriguez
108505a6a0
Merge branch '2.0-form-helper' into 2.0
2011-07-16 17:32:07 -04:30
José Lorenzo Rodríguez
11f4d1c0e9
Fixing whitespace in CakeSchema
2011-07-15 14:49:33 -07:00
José Lorenzo Rodríguez
7596fcf45a
Merge pull request #153 from ajibarra/e4c1f28d849c6a60c369265a502315260babe80b
...
Preventing AppModel to be inspected inside CakeSchema
2011-07-15 14:48:01 -07:00
José Lorenzo Rodríguez
57a8c108a6
Merge pull request #147 from burzum/feature/2.0-return-query
...
Feature/2.0 return query
2011-07-15 14:10:08 -07:00
Alejandro Ibarra
e4c1f28d84
Included validation to skip AppModel on CakeSchema->readSchema because it tries to find 'app_models' table. Added testSchemaReadWithAppModel test
2011-07-15 15:18:38 -04:30
Jose Lorenzo Rodriguez
ef5650c034
Fixing ClassRegistry that was incorrectly checking class inheritance
...
Fixing Model class that was incorrectly sending model names to be instantiated
Fixing more FormHelper tests
2011-07-14 01:30:52 -04:30
Florian Krmer
adb943b7fd
Refactoring the code to build the query array as suggested here https://github.com/cakephp/cakephp/pull/147#issuecomment-1553663
2011-07-12 23:31:07 +02:00
Ceeram
6047024546
removing unneeded parameter
2011-07-12 17:00:25 +02:00
José Lorenzo Rodríguez
273125d2f5
Merge pull request #146 from majna/2.0-database-session
...
Refactored DatabaseSession to use only 'Session.handler.model' config
2011-07-11 16:28:25 -07:00
Florian Krmer
9d7c97c296
Adding the "returnQuery" key to the 2nd argument of the find() method to be able to get the query array back from the before state of findMethod() calls. This was required in the past for some more complex queries and is in 2.0 no longer possible because the find methods became protected.
2011-07-12 01:04:22 +02:00
Ceeram
4d702ee97f
removing unused parameter for value()
2011-07-11 22:13:03 +02:00
Ceeram
00dd1ccc96
removing unneeded parameter, describe() only takes one parameter
2011-07-11 21:07:44 +02:00
Majna
cde13daed4
Refactored DatabaseSession to use only 'Session.handler.model' config. Fixed static call on non-static method DatabaseSession::gc(). Fix for SessionFixture -primary key too long (MySQL Error: 1071)
2011-07-11 00:16:41 +02:00
Leonid Mamchenkov
b6ff3a6fdf
Fixed typo in the comment
2011-07-07 15:14:06 +03:00
Jose Lorenzo Rodriguez
765164f33b
Merge branch '2.0-extract-model-validation' into 2.0
2011-07-07 01:05:39 -04:30
Jose Lorenzo Rodriguez
ee2930d3d0
Removing magic variable in DboSource to bypass the adding of fields to association queries, instead adding the ability to declare 'fields' => false in the association array. This opens the possibility of having joins for filtering purposes.
2011-06-28 11:45:37 -04:30
ADmad
b22e30c5a3
Removing unneeded magic methods. Closes #1802
2011-06-28 17:28:36 +05:30
Mark Story
08f1afe328
Updating varchar, text columns to use nvarchar.
...
This storage type stores unicode properly, and is the
saner default datatype for most applications.
Fixes #1321
2011-06-23 23:01:17 -07:00
Mark Story
3169c5a1e7
Fixing issues with unicode quoting.
2011-06-23 16:13:35 -07:00
Mark Story
9ab2ec7d49
Adding support for Unicode characters. Refs #1321
2011-06-23 15:46:03 -07:00
Mark Story
623466dcf8
Removing duplicated code.
2011-06-23 14:34:45 -07:00
Mark Story
91a1cf81f3
Merge branch '1.3' into merger
...
Conflicts:
app/Config/acl.ini.php
app/config/database.php.default
app/webroot/css.php
app/webroot/css/cake.generic.css
cake/basics.php
cake/bootstrap.php
cake/config/paths.php
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/bake.php
cake/console/libs/i18n.php
cake/console/libs/shell.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/testsuite.php
cake/console/templates/default/classes/test.ctp
cake/console/templates/default/views/home.ctp
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/views/elements/email/text/default.ctp
cake/console/templates/skel/webroot/css.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cake_session.php
cake/libs/configure.php
cake/libs/controller/component.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/error.php
cake/libs/magic_db.php
cake/libs/model/behaviors/acl.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/errors/missing_behavior_class.ctp
cake/libs/view/errors/missing_behavior_file.ctp
cake/libs/view/errors/missing_component_class.ctp
cake/libs/view/errors/missing_component_file.ctp
cake/libs/view/errors/missing_connection.ctp
cake/libs/view/errors/missing_controller.ctp
cake/libs/view/errors/missing_helper_class.ctp
cake/libs/view/errors/missing_helper_file.ctp
cake/libs/view/errors/missing_layout.ctp
cake/libs/view/errors/missing_model.ctp
cake/libs/view/errors/missing_scaffolddb.ctp
cake/libs/view/errors/missing_table.ctp
cake/libs/view/errors/missing_view.ctp
cake/libs/view/errors/private_action.ctp
cake/libs/view/errors/scaffold_error.ctp
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/xml.php
cake/libs/view/media.php
cake/libs/view/pages/home.ctp
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/index.ctp
cake/libs/view/scaffolds/view.ctp
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/console/libs/acl.test.php
cake/tests/cases/console/libs/api.test.php
cake/tests/cases/console/libs/bake.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/console/libs/tasks/db_config.test.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/plugin.test.php
cake/tests/cases/console/libs/tasks/project.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/console/libs/tasks/view.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/configure.test.php
cake/tests/cases/libs/controller/component.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/media.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/groups/acl.group.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/cache.group.php
cake/tests/groups/components.group.php
cake/tests/groups/configure.group.php
cake/tests/groups/console.group.php
cake/tests/groups/controller.group.php
cake/tests/groups/database.group.php
cake/tests/groups/helpers.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/model.group.php
cake/tests/groups/no_cross_contamination.group.php
cake/tests/groups/routing_system.group.php
cake/tests/groups/socket.group.php
cake/tests/groups/test_suite.group.php
cake/tests/groups/view.group.php
cake/tests/groups/xml.group.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_test_suite_dispatcher.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/reporter/cake_base_reporter.php
cake/tests/lib/reporter/cake_cli_reporter.php
cake/tests/lib/reporter/cake_text_reporter.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/libs/library.php
cake/tests/test_app/libs/log/test_app_log.php
cake/tests/test_app/plugins/test_plugin/config/load.php
cake/tests/test_app/plugins/test_plugin/config/more.load.php
cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
cake/tests/test_app/vendors/Test/MyTest.php
cake/tests/test_app/vendors/Test/hello.php
cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
cake/tests/test_app/vendors/shells/sample.php
cake/tests/test_app/vendors/somename/some.name.php
cake/tests/test_app/vendors/welcome.php
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
lib/Cake/Console/Templates/skel/webroot/test.php
lib/Cake/Console/cake.bat
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Log/CakeLog.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/test_app/View/Emails/html/custom.ctp
lib/Cake/Test/test_app/View/Emails/text/custom.ctp
lib/Cake/TestSuite/templates/header.php
lib/Cake/Utility/Sanitize.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
e33a9a7846
Adding new limit/offset pagination for SQLServer 11.
2011-06-22 17:01:36 -07:00
Mark Story
1a155c80c0
Fixing support for nchar and nvarchar fields in SQL server.
...
These fields report their length as double of what its defined.
2011-06-22 11:39:06 -07:00
Mark Story
3bc6195967
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-06-22 10:56:18 -07:00
Mark Story
a825d8280f
Adding support for SQLServer's datetime2 column,
...
as that is the preferred datetime format in SQLServer.
2011-06-22 10:24:45 -07:00
Mark Story
d45b7fa174
Fixing identity check.
2011-06-22 10:15:15 -07:00
Graham Weldon
876a047a76
Change type check to loose type checking for Sqlserver limit -1
2011-06-22 09:54:35 -07:00
Mark Story
0c1472ee44
Adding better support for nvarchar(MAX) in SQLServer
...
Newer versions of SQLServer perfer to use nvarchar(max) for
text columns.
2011-06-22 09:05:06 -07:00
Mark Story
936d068eec
Reformating SQLServer 'describe' query.
2011-06-22 09:05:06 -07:00
Jose Lorenzo Rodriguez
d0ef655601
Using the field name for aliasing for Sqlsrv as in Postgres, removing dead code
2011-06-21 18:58:33 -04:30
Jose Lorenzo Rodriguez
97e51f1d94
Removing Sqlserver::value() as it is already abstracted in DboSource
2011-06-21 18:07:05 -04:30
Jose Lorenzo Rodriguez
f79fc74aad
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-06-21 17:09:53 -04:30
Jose Lorenzo Rodriguez
9aa2a4227f
Fixing offsetting in paginated queries in SqlSrv
2011-06-21 17:09:12 -04:30
Mark Story
f353eb733f
Fixing incorrect default value.
2011-06-21 14:20:20 -07:00
Mark Story
4deedf6da2
Removing extra paging result that ends up because of SQLserver 10 workarounds.
2011-06-21 13:17:49 -07:00
Jose Lorenzo Rodriguez
3d2a732cd3
Reverting testing changes pushed in past commit
2011-06-21 15:30:17 -04:30
Jose Lorenzo Rodriguez
a34358faa4
Fixing FormAuthenticateTest for Sqlsrv
2011-06-21 14:29:18 -04:30
Graham Weldon
f1108b2ef1
Fixed pagination for SqlServer
2011-06-21 11:38:09 -07:00
Jose Lorenzo Rodriguez
f4aeb514e3
Fiing CakeSchema so it runs without errors on Sqlsrv
2011-06-21 11:13:33 -04:30
Jose Lorenzo Rodriguez
cdc81333e8
Adding support in SqlSrv for drop table if exists
2011-06-20 19:49:06 -04:30
Jose Lorenzo Rodriguez
cf49d51e75
Fixing the binary type for SqlSrv
2011-06-20 19:14:21 -04:30
Jose Lorenzo Rodriguez
9f85e24413
Adding float precision support to CakeSchema when using Sqlsrv
2011-06-20 18:43:26 -04:30
Jose Lorenzo Rodriguez
e758b272bd
Fixing problems when running the AllTests testsuite
2011-06-20 01:34:25 -04:30
Jose Lorenzo Rodriguez
33c74b6062
Implementing validation domain extraction in the ExtractionTask
2011-06-20 00:36:31 -04:30
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Jose Lorenzo Rodriguez
2a39e6869c
Merge branch '2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
2011-06-17 18:04:03 -04:30
Florian Krmer
98e29b7246
Fixing the DatabaseSession to work with models that use a different primary key field than id.
2011-06-15 22:56:55 +02:00
Leonid Mamchenkov
8271970639
Fix for PHP notice ( Fixes #1424 )
2011-06-02 01:12:25 +03:00
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7
According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything.
2011-05-30 22:26:42 +02:00
ADmad
4c042ae133
Adding proper visibility keywords for class functions
2011-05-29 03:31:34 +05:30
Maggion Emmanuel
8a701f3ac9
Fixed this following error: failed to open stream: No such file or directory [CORE\Cake\Model\Behavior\AclBehavior.php, line 52]
2011-05-28 06:45:06 -07:00
ADmad
40c397b003
Merge pull request #98 from majna/2.0
...
Fix for wrong callback in $callbacks array: renamed afterError to onError
2011-05-27 15:02:48 -07:00
Majna
17384f3cf4
Fix for wrong callback in $callbacks array: renamed afterError to onError
2011-05-27 23:23:11 +02:00
Jose Lorenzo Rodriguez
e669a81e0a
Reverting change in ConnectionManager, sourceList() will only return the instantiated datasources
...
Fixing remaining tests failing due to contamination of loaded plugin is app
2011-05-27 02:28:38 -04:30
Jose Lorenzo Rodriguez
b320e4323f
Improving ConnectionManager tests
2011-05-27 02:13:35 -04:30
Jose Lorenzo Rodriguez
01f6744e35
Removing unneeded line in ConnectionManager
2011-05-27 01:31:50 -04:30
Ceeram
5f97292648
Change case of Controller::$plugin, fixing missing plugin exceptions, tests updated. Also removing no longer needed camelize() calls
2011-05-26 15:31:40 +02:00
Juan Basso
a744a74f1e
Not changing to NULL strings.
2011-05-23 23:10:44 -04:00
Juan Basso
7bae41c461
Fixed the error check in queries and storing the right value to last affected in non-select queries.
2011-05-23 00:22:08 -04:00
Juan Basso
39320ef352
Renamed the Mssql driver to Sqlserver.
2011-05-22 23:19:13 -04:00
Juan Basso
e049e35b5d
Catching the error in execute for SQL Server to have the same behavior from the others drivers.
2011-05-22 22:16:22 -04:00
Juan Basso
f0db55de6f
Using dbo methods to manage the transaction.
2011-05-22 01:07:58 -04:00
Juan Basso
ad67f3e1bc
SQL Server PDO support prepare only to SELECT statements, others commands need to use exec method.
2011-05-22 00:49:49 -04:00
Juan Basso
968fa1d5ef
Included an option to configure the prepate statement. SQL Server requires the cursor option to return the affected rows.
2011-05-21 22:40:30 -04:00
Juan Basso
11d249e43b
Updating PHPDoc and method visibility.
2011-05-21 22:18:57 -04:00
Juan Basso
375f86d2a6
Changed the default empty value when create columns.
2011-05-21 21:50:25 -04:00
Renan Gonçalves
c602fc845b
Reverting the change to insertMulti, worked to solve the cache issue when trying to get the model schema.
2011-05-18 20:59:17 +02:00
Renan Gonçalves
37b9bd59bc
Trying to fix the Mssql as much as possible.
...
Adding parameter to the insertMulti() method because Mssql tries to get the table schema and it fails most of the time.
2011-05-18 20:12:36 +02:00
Renan Gonçalves
d1a984cde9
Resolving merge conflict.
2011-05-18 19:58:12 +02:00
AD7six
fe2ec74b0e
correct paths to Config dir
2011-05-16 21:52:25 +02:00
AD7six
0cb70ae3bb
remove CONFIGS constant
2011-05-15 18:34:52 +02:00
AD7six
afa8f6b441
remove LIBS constant
...
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
Jose Lorenzo Rodriguez
5f56642e0e
Updating tests and classes in Console package after most recent updates in folder casing
2011-05-14 23:40:09 -04:30
Jose Lorenzo Rodriguez
eea981940e
Replacing config string in favor of Config
2011-05-13 03:36:45 -04:30
Juan Basso
9dfc7d6593
Changed the field map to protected to run the tests. It is not requeried to be private.
2011-05-05 21:30:51 -04:00
Juan Basso
3231755d63
Fixed the tests for value.
2011-05-05 21:30:51 -04:00
Juan Basso
24bf56b44e
Revert "Removed the value method from MSSQL. It is provided by DboDatasource now."
...
This reverts commit bf0fb8302385d384239939df2ea6bc6f1a8dbaa0.
2011-05-05 21:30:51 -04:00
Juan Basso
b91f6eb991
Fixed error in change.
2011-05-05 21:30:51 -04:00
Juan Basso
a7a86e42a3
Changes for fetch results.
2011-05-05 21:30:51 -04:00
Juan Basso
83b81ffd87
Removed more methods that is implemented by DboSource.
2011-05-05 21:30:51 -04:00
Juan Basso
f11b153d80
Removed the value method from MSSQL. It is provided by DboDatasource now.
2011-05-05 21:30:51 -04:00
Juan Basso
37d26f2923
Update the describe.
2011-05-05 21:30:51 -04:00
Juan Basso
3f984b68fa
Update the listSources.
2011-05-05 21:30:51 -04:00
Juan Basso
244bc1369a
Removed the execute method from MSSQL. It is provided by DboDatasource now.
2011-05-05 21:30:51 -04:00
Juan Basso
4e8b863910
Initial changes for init the connection with MSSQL.
2011-05-05 21:30:50 -04:00
Juan Basso
30fd9fff14
Changed the import files and Mssql class name to the new structure.
2011-05-05 21:30:50 -04:00
Jose Lorenzo Rodriguez
d83555cc52
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
2011-05-04 01:10:23 -04:30
Jose Lorenzo Rodriguez
8dc675335a
Small refactoring, and adding some App::uses() to avoid problems
2011-04-21 17:56:03 -04:30
ADmad
3844966714
Changed default value for key 'last' in validator options to true. Also implemented ability to list messages for all failed validations for a field at once, instead of current display of just one message at a time.
2011-04-18 02:08:48 +05:30
Jose Lorenzo Rodriguez
f14a295a3e
Adding a ConenctionManager::drop() method useful for testing and other dynamic tasks
2011-04-16 22:57:05 -04:30
ADmad
d83712ce43
Renaming Model::$_findMethods to Model::$findMethods and changing visibility to public. Closes #1328
2011-04-17 06:09:00 +05:30
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
268c061a2e
t
...
dividing language domains
cake - end user
cake_error - error messages
cake_developer - not an error, just for the developer
2011-03-19 18:16:12 +01:00
AD7six
38180e8951
translation changes in the model dir
2011-03-12 20:01:12 +01:00
Jose Lorenzo Rodriguez
42b3f993b9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-01 23:04:52 -04:30
Jose Lorenzo Rodriguez
ba694c45c9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-02-27 22:50:53 -04:30
José Lorenzo Rodríguez
b314149efd
Checkin that PluginAppModel is not in the list of modles to be used for CakeSchema
2011-02-21 23:28:00 -04:30
José Lorenzo Rodríguez
6e4f4efb79
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
lib/Cake/Console/Command/TestSuiteShell.php
lib/Cake/Console/TaskCollection.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Controller/Controller.php
lib/Cake/Core/App.php
lib/Cake/Model/BehaviorCollection.php
lib/Cake/Network/CakeRequest.php
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
lib/Cake/TestSuite/CakeWebTestCase.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/TestSuite/TestRunner.php
lib/Cake/View/HelperCollection.php
lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
lib/Cake/tests/cases/libs/test_manager.test.php
2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
e81ff384c7
Fixing BehaviorCollection test regarding how classes are loaded. with the introduction of App::uses() it is not possible to determine if a file is missing or just the class in the file, so removing the throwing of MissingBehaviorFileException seems the only choice
2011-01-28 01:48:15 -04:30
José Lorenzo Rodríguez
0bde6d35f5
Fixing Acl classes loading for the AclBehavior tests
2011-01-28 01:44:04 -04:30
José Lorenzo Rodríguez
2386a11151
fixing tests from last merge
2011-01-22 01:11:22 -04:30
José Lorenzo Rodríguez
d9c99b5ef6
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
1332561164
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
lib/Cake/Console/Command/Task/FixtureTask.php
2011-01-09 23:32:05 -04:30
José Lorenzo Rodríguez
cd28f19363
Making CakeSchema tests pass
2011-01-08 23:45:07 -04:30
José Lorenzo Rodríguez
e87dca62f1
Fixing postgres dbo source tests
2011-01-05 23:00:33 -04:30
José Lorenzo Rodríguez
ed06d00e4a
fixing merge error in AclNode class
2011-01-05 22:50:33 -04:30
José Lorenzo Rodríguez
e8a93aef93
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Temporarly commenting code on App class while the transition is made
Conflicts:
lib/Cake/Core/App.php
2011-01-05 22:21:27 -04:30
José Lorenzo Rodríguez
54ecd2e77b
Some changes to ConnectionManager, it is now an static class. the connection objects enumeration will return the stored connections config instead of a cryptic array where only the ekys where useful
2011-01-05 22:15:17 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
9884a05a28
Reanaming file so it reflects the class contained in it
2010-12-22 00:02:33 -04:30
José Lorenzo Rodríguez
eed6d26ab6
Extracting acl model classes to their own files
2010-12-22 00:01:03 -04:30
José Lorenzo Rodríguez
633f1dc1e5
Fixing warning in ConnectionManager
2010-12-18 22:27:02 -04:30
José Lorenzo Rodríguez
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
8e5bd76752
Fixing several errors when running the testsuite
2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
b8344ecd33
Replacing some of the App::import by App::uses
2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
848461f7a0
Making the testsuite run again
2010-12-08 01:49:36 -04:30
José Lorenzo Rodríguez
02ad049559
Fixing more shells, and updating code in home.ctp
2010-12-07 20:42:50 -04:30
José Lorenzo Rodríguez
7828f7d2fb
Lazy loading connections in ConnectionManager, changing some class names and imports
2010-12-07 19:59:07 -04:30
José Lorenzo Rodríguez
b5122e6e81
Fixing more console classes
2010-12-07 01:44:47 -04:30
José Lorenzo Rodríguez
0732552739
Movig CakeSession to a better suited package
2010-12-07 00:02:42 -04:30
José Lorenzo Rodríguez
9e64754005
Adding check to no overwrite cache if it has not been modified
2010-12-07 00:00:20 -04:30
José Lorenzo Rodríguez
513eb53426
Fixing package location in DboSource
2010-12-06 22:48:30 -04:30
José Lorenzo Rodríguez
66744c68b0
Making ConnectionManager an static object instead of a singleton
2010-12-06 22:47:43 -04:30
José Lorenzo Rodríguez
5dddb362ec
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/config/ini_file.php
2010-12-06 09:42:52 -04:30
José Lorenzo Rodríguez
575a6b4b78
A couple of micro-optimizations found using a profileA couple of micro-optimizations found using a profilerr
2010-12-06 09:38:06 -04:30
José Lorenzo Rodríguez
d311cf237b
Moving behaviors
2010-12-05 23:50:05 -04:30
José Lorenzo Rodríguez
3f64844de9
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
2fed702c57
Moving more model classes to the new package
2010-12-05 15:00:02 -04:30
José Lorenzo Rodríguez
fcd23b0978
Starting to change the class loading for app classes
2010-12-05 10:54:42 -04:30
José Lorenzo Rodríguez
7dc8d5e746
Simplifying datasources loading, it now requires datasources to be configured with the 'datasource' array key, which is a relative path from Model/Datasource/
2010-12-04 12:24:15 -04:30
José Lorenzo Rodríguez
be1263d476
Moving the first database driver to the correct folder to start testing
2010-12-04 11:52:23 -04:30
José Lorenzo Rodríguez
8678661b9c
Merge branch 'feature/2.0/pdo' into 2.0-class-loading
2010-12-04 11:21:54 -04:30
José Lorenzo Rodríguez
592abb569c
More work towards loading datasources
2010-12-04 11:16:42 -04:30
José Lorenzo Rodríguez
4bb6d583b7
More work towards model loading
2010-12-04 03:00:03 -04:30
José Lorenzo Rodríguez
fa83ecda5b
Beginnings of model loading
2010-12-04 02:57:20 -04:30
José Lorenzo Rodríguez
ec93152c9a
Loading the set class successfully
2010-12-04 02:51:42 -04:30
José Lorenzo Rodríguez
c641baaf16
Loading component classes ang beginnings of session loading
2010-12-04 02:49:44 -04:30