José Lorenzo Rodríguez
183e9c92df
Removing some asignations by reference
2010-10-17 10:18:46 -04:30
José Lorenzo Rodríguez
082873721c
Changing param order in execute() to maintain compatibility, making all tests pass
2010-10-16 20:28:07 -04:30
José Lorenzo Rodríguez
25915bd931
Merge remote branch 'origin/2.0' into feature/2.0/pdo
2010-10-16 14:20:58 -04:30
José Lorenzo Rodríguez
d83c95cf46
Fixing bug in DboMysql::value()
2010-10-16 14:01:01 -04:30
José Lorenzo Rodríguez
88a2fb5058
Fixing bug in DboMysql::describe()
2010-10-16 13:44:16 -04:30
José Lorenzo Rodríguez
17f24719ee
Replacing reference assignation for normal assignation in test case
2010-10-16 13:32:59 -04:30
José Lorenzo Rodríguez
84283ed6f3
Fixing DboMysql::listDetailedSources()
2010-10-16 13:28:18 -04:30
José Lorenzo Rodríguez
e03cbcb167
Fixing model describing and making pass testBlobSaving
2010-10-16 10:23:13 -04:30
José Lorenzo Rodríguez
526205b546
Fixing test case in DboMysql
2010-10-15 18:41:17 -04:30
José Lorenzo Rodríguez
5e80cf8ff7
Improving DboMysql::index()
2010-10-15 17:27:36 -04:30
José Lorenzo Rodríguez
0fb2ac0285
Chaging implementation of DboMysql::getVersion(), improving connection options
2010-10-15 17:03:59 -04:30
José Lorenzo Rodríguez
70ed9a7b12
Fixing DboMysql::index() method
2010-10-15 17:02:37 -04:30
José Lorenzo Rodríguez
dc362d1a38
Adding test for DboMysql::getEncoding()
2010-10-14 23:18:07 -04:30
José Lorenzo Rodríguez
09e06d52b9
Implementing DboMysql::getVersion()
2010-10-14 23:15:17 -04:30
José Lorenzo Rodríguez
b8479459d6
Inital work for connecting to mysql using PDO and gettng the table list, testing is easier as it now uses mocks
2010-10-14 01:10:51 -04:30
mark_story
0c070f7131
Fixing tests that were failing due to SimpleTest being less sensitive to types than PHPUnit.
...
Fixing tests that were failing due to XmlHelper being removed in 2.0.
2010-10-13 23:09:55 -04:00
mark_story
f19e3d501c
Merge branch '1.3' into integration
...
Conflicts:
cake/libs/model/cake_schema.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/model.php
cake/libs/view/helpers/form.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
3ab77017ae
Fixing OpenTest license mentions to use MIT License
...
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d
Changing the @license tag on test files, as tests can now be MIT like
...
the rest of CakePHP.
2010-10-03 12:27:27 -04:00
mark_story
5e26d282a1
Fixing connection specific schema generation
...
Fixing missing table errors when reading schema for specific connections.
Tests updated to check that tables not on a connection are never touched. Fixes #1106
2010-09-30 23:22:57 -04:00
mark_story
c573fd0432
Fixing issue where a beforeDelete() could trigger a table truncation.
...
Moving the exists check below beforeDelete() and behavior->beforeDelete() so any records deleted in the callbacks will not exist when db->delete() is called. Test updated. Fixes #250
2010-09-29 23:31:41 -04:00
evilbloodydemon
38e128b597
test for #250
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-09-29 23:06:47 -04:00
mark_story
b08aba8e86
Adding a missing rollback when validation on an associated record fails, and validate = first. Fixes #1147
2010-09-28 23:37:28 -04:00
mark_story
9992cff96c
Adding another test for #250 .
2010-09-28 22:26:54 -04:00
José Lorenzo Rodríguez
0eaf437fe4
Merge remote branch 'origin/2.0' into 2.0-phpunit-upgrade
2010-09-27 23:19:47 -04:30
José Lorenzo Rodríguez
2635733aba
Merge branch '2.0' into 2.0-phpunit-upgrade
2010-09-27 22:42:10 -04:30
José Lorenzo Rodríguez
ba168d1a72
Initial steps towards migrating to phpunit 3.5
2010-09-27 22:37:23 -04:30
mark_story
92b57d81ee
Moving common setup and teardown functionality in to CakeTestCase.
...
Removing repeated setup/teardown logic from test cases.
Switching tests to use setup/teardown instead of startTest/endTest.
2010-09-25 21:36:49 -04:00
mark_story
843ada240a
Removing AppController from ErrorHandler test as it can make testing harder.
...
Removing broken buffering from tests that trigger errors / exceptions.
Adding a loadHelper() to the test_app layout so the layout always has the required helper.
2010-09-25 10:41:08 -04:00
mark_story
714d8298c4
Fixing all tasks include.
...
Removing drop table queries that cause other tests to fail.
2010-09-25 01:25:42 -04:00
mark_story
26057c59c4
Fixing issue in DboSource test case where buffer would eat all the output.
...
Removing dead tests from TestManager test.
2010-09-25 01:13:01 -04:00
mark_story
6974a8752f
Removing a test that used eval(). It caused issues in group tests.
2010-09-24 23:30:02 -04:00
José Lorenzo Rodríguez
5c3b4cfcc4
Removing all uses of the test_suite connection in the test cases
2010-09-24 23:30:01 -04:00
mark_story
e6824e6a41
Fixing duplicate class names.
2010-09-24 23:30:01 -04:00
mark_story
03d99d43be
Fixing unbalanced ob_start().
...
Removing dead code.
2010-09-24 23:30:00 -04:00
mark_story
92ed1e76da
Fixing file included in all_models.
...
Adding skip as tests fail when classes already exist.
Fixing skip condition to use newer api.
2010-09-24 23:30:00 -04:00
mark_story
78c838bcdd
Fixing failing tests caused by fixture data changes.
2010-09-24 23:30:00 -04:00
mark_story
76ef390d4a
Updating CakeSchema test case to run in suites. It did not account for additional tables being in the database when it ran.
2010-09-24 23:28:48 -04:00
mark_story
f21161ef46
Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
...
differences upon merging.
Conflicts:
app/config/core.php
cake/console/templates/skel/config/core.php
cake/libs/cache/file.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/i18n.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
729a45703b
Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121
2010-09-21 20:34:27 -04:00
mark_story
d113d7d612
Removing dead code from DboSource::fields()
...
Updating fields() to use implode, so complex virtual fields are better handled. Fixes #1079
2010-09-18 00:04:36 -04:00
mark_story
738d92cc3e
Fixing failing tests caused by fixture data changes.
2010-09-18 00:03:22 -04:00
mark_story
5a8648cca0
Fixing issue in DboSource::_matchRecords() where unqualified conditions would result in 1=1 conditions. Fixing incorrect test case. Fixes #930
2010-09-16 00:17:09 -04:00
mark_story
730e373afe
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/cake_session.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/fixtures/data_test_fixture.php
2010-09-12 13:35:46 -04:00
mark_story
55ecfe0292
Fixing stupid typo.
2010-09-11 15:48:48 -04:00
Mark Story
aad72871a0
Adding more tests for virtualFields and complex expressions. Closes #1079
2010-09-07 00:32:44 -04:00
Mark Story
e15069769d
Adding tests for #1079 and fixing some formatting.
2010-09-07 00:09:06 -04:00
Mark Story
45dab88180
Adding a cast to fix a failing test from the merge.
2010-09-06 16:54:32 -04:00
Mark Story
d88da3d579
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/configure.php
cake/libs/model/connection_manager.php
cake/libs/model/model.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
464d2217e6
Renaming model_behavior test to behavior_collection test as that's the class that contains the tested methods.
2010-09-06 13:51:42 -04:00
Mark Story
5789aaf24d
Applying patch from 'tkykmw'. Behavior mapped methods are no longer run through strtolower(). Mapped methods are now case sensitive. Fixes #318
2010-09-06 13:38:01 -04:00
mark_story
b02e213958
Adding test case from '0x20h'. Fixing issue where atomic = false, validate = first and saveAll() saving many rows could return an incorrect value. Fixes #1050
2010-08-26 22:21:39 -04:00
mark_story
123873b4d8
Updating DboSource test to account for formatting of floats done in mysql/postgresql.
2010-08-26 21:20:13 -04:00
dogmatic69
95168cee6e
casting the find as an array to avoid errors with array_values() fixes #1041 and 4 failing tests (3 previous)
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-08-26 20:32:48 -04:00
mark_story
5446a062ee
Fixing issue where whitelist would not be used for validation. Test case added. Fixes #1037
2010-08-21 22:48:59 -04:00
mark_story
eb96d8acfb
Adding tests to dbo_postgres for localized floats. Refs #1029
2010-08-21 00:39:45 -04:00
mark_story
afc05c1e05
Adding test cases for using localized floats with mysql. Also added a generic model test case. Refs #1029
2010-08-21 00:19:30 -04:00
mark_story
f46241a6e7
Merge branch '2.0' into 2.0-helpers
2010-08-16 23:02:44 -04:00
mark_story
705e90bef7
Merge branch '1.3' into 2.0-merge
...
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
686b9c2c8b
Fixing issues in alterSchema in DboMysql and DboPostgres, where fields would be appended to each table being altered.
...
Also fixed an issue in DboPostgres where the generated alter statements would contain too many ;.
Test cases added. Fixes #1023
2010-08-15 22:17:02 -04:00
mark_story
c78e869be6
Removing PHP4 workarounds in BehaviorCollection.
...
Making BehaviorCollection throw exceptions instead of use cakeError.
2010-08-10 23:18:39 -04:00
mark_story
29ddffa2d3
Fixing regression in DboMysqlBase where describe() was no longer pulling out fieldParameters. A test case has been added to catch any future regressions. Fixes #991
2010-08-09 23:25:32 -04:00
Juan Basso
ae2fa908c5
Dont use private attributes as tables in CakeSchema. Fixes #7
2010-08-02 00:22:46 -03:00
mark_story
373bebb128
Updating test suite to properly handle parent_id situations. Fixes #881
2010-07-29 22:26:30 -04:00
mark_story
ac9721d582
Wrapping long lines.
2010-07-29 22:07:45 -04:00
mark_story
2b1efafe65
Applying optimization from 'michaelc' to reduce number of strtolower() calls in AclBehavior. Fixes #972
2010-07-29 22:04:22 -04:00
mark_story
a9bb4eefae
Fixing failing test caused by registry pollution.
...
Adding a test case to prove that unqualified column names work with postgresql. Closes #930
2010-07-29 00:06:11 -04:00
mark_story
596c751ea3
Converting spaces to tabs.
2010-07-28 23:42:36 -04:00
mark_story
d38857095a
Merge branch '1.3' into 2.0
...
Conflicts:
cake/libs/model/model.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
ADmad
91b0a4ba4f
Changing Tree behavior's function names to be camel cased as per convention
2010-07-24 23:32:49 +05:30
Scott Reeves
88e32b3cee
Fixing typo
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:15:28 -04:00
José Lorenzo Rodríguez Urdaneta
c7f1650510
Fixing test case
2010-07-15 23:16:47 -04:30
José Lorenzo Rodríguez Urdaneta
b8b4647355
Removing use of cakeError in Model and replacing it with an Exception
2010-07-15 23:11:30 -04:30
mark_story
4c27c24a72
Fixing issue in DboSource where COUNT() was hardcoded, omitting any other aggregate functions. Replaced with a regexp that accepts only letters. Test case added. Fixes #878
2010-07-15 23:17:38 -04:00
José Lorenzo Rodríguez Urdaneta
e30904f8b4
Removing some of the loaded fixtures to show that tables are not needed in the process of model construction
2010-07-15 21:45:50 -04:30
José Lorenzo Rodríguez Urdaneta
a13be623b5
Making the model require database connection only wen needed or requested
2010-07-15 21:16:52 -04:30
José Lorenzo Rodríguez Urdaneta
67612872da
Removing non used fixtures
2010-07-14 23:31:54 -04:30
José Lorenzo Rodríguez Urdaneta
e165f7d559
Changing how dynamic "with" models are loaded
...
Changing all calls to get model's datasourse to use Model::getDatasource()
2010-07-14 23:19:38 -04:30
José Lorenzo Rodríguez Urdaneta
0ec30be076
Improving tests for model associations lazy loading
2010-07-14 22:10:56 -04:30
José Lorenzo Rodríguez Urdaneta
c1a9a2e263
Correctly registering plugin models in CR, initial test case onmodel associations lazy loading
2010-07-14 19:23:41 -04:30
José Lorenzo Rodríguez Urdaneta
fdf91194a6
Initial approach for model associations lazy loading, all model tests passing
2010-07-14 16:58:12 -04:30
José Lorenzo Rodríguez Urdaneta
62bc184506
Fixing ModelWrite Test
2010-07-13 21:42:07 -04:30
mark_story
e382a1c63c
Adding test case for find(list) with recursive.
2010-07-11 18:38:27 -04:00
mark_story
65efd675c1
Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873
2010-07-11 13:06:33 -04:00
mark_story
4cd43553b4
Fixing issues where multiple reset bindModel() calls would cause incorrect associations to be restored.
...
Also fixing issues where multiple calls to unbindModel() would cause incorrect associations to be restored.
Tests added.
Fixes #889
2010-07-03 18:05:14 -04:00
mark_story
17a7a96ba2
Fixing issue where non-reset associations would get reset by resetAssociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868
2010-07-01 12:39:50 -04:00
mark_story
cd8dff362d
Merge branch '2.0-phpunit' into 2.0
...
Conflicts:
cake/libs/controller/components/email.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
929bb5769e
Merge branch '1.3' into 2.0
...
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
a166ea78cb
Fixing fails in dbo source test caused by not enough fixtures being loaded.
2010-06-25 23:40:29 -04:00
José Lorenzo Rodríguez Urdaneta
72c7c3f44e
Completing migration of ModelIntegration test case to phpunit
2010-06-24 00:52:43 -04:30
Juan Basso
2a4489cdf2
Naming conventions to datasources with plugins. Fixes #819
2010-06-20 23:53:54 -03:00
mark_story
aee1c5483b
Renaming test case classes to better reflect the filenames.
2010-06-13 10:06:00 -04:00
José Lorenzo Rodríguez
d35e02a1e1
Sending correct patch for previous commit
2010-06-10 00:02:45 -04:30
José Lorenzo Rodríguez
1b9eb035fd
Migrating DboMyqli to phpunit
2010-06-09 23:00:35 -04:30
José Lorenzo Rodríguez
0a3e27b000
Migrating DboPostgres to phpunit
2010-06-09 22:52:28 -04:30
José Lorenzo Rodríguez
b3d9de1a97
Improving migration of DboMysqlTest to phpunit
2010-06-09 21:19:25 -04:30
José Lorenzo Rodríguez
a8328f3872
Migrating DboMysqlTest to PHPUnit
2010-06-09 21:03:46 -04:30
José Lorenzo Rodríguez
9b3df1ea0e
Migrating DboSourceTest to PHPUnit
2010-06-09 20:47:25 -04:30
mark_story
ad8b70cec2
Removing continue statement that did nothing.
...
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
mark_story
2f527cc5af
Adding a few tests for DboSource::fullTableName();
2010-06-08 23:29:40 -04:00
mark_story
d0309d0c18
Fixing access violations in DbAcl test case.
2010-06-07 23:47:48 -04:00
José Lorenzo Rodríguez
bd7ce3804e
Migrating CakeSchemaTest to PHPUnit
2010-06-07 00:05:40 -04:30
José Lorenzo Rodríguez
e381be7a85
Migrating AclBehaviorTest to PHPUnit
2010-06-06 23:34:34 -04:30
José Lorenzo Rodríguez
0aff378be8
Migrating TreeBehaviorTest to phpunit
2010-06-05 00:35:31 -04:30
José Lorenzo Rodríguez
d951e4a218
Migrating TranslateBehaviorTest to phpunit
2010-06-05 00:10:01 -04:30
José Lorenzo Rodríguez
fd4db4184a
Migrated ConnectionManager to phpunit
2010-06-04 23:47:38 -04:30
José Lorenzo Rodríguez
94dd8a2543
Migrating ModelBehaviorTest to phpunit
2010-06-04 23:27:28 -04:30
José Lorenzo Rodríguez
d04278cb8e
Migrating ModelIntegrationTest to PHPUnit
2010-06-04 23:19:33 -04:30
José Lorenzo Rodríguez
c23fe5d72e
Migrating ModelReadTest to PHPUnit
2010-06-04 23:07:29 -04:30
mark_story
bd6e16be26
Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789
2010-06-03 23:20:37 -04:00
José Lorenzo Rodríguez
2e7d2d5587
Migrating ModelWriteTest to phpunit
2010-06-02 00:30:52 -04:30
José Lorenzo Rodríguez
7d6ac7585a
Migrating ModelValidationTest to phpunit
2010-06-01 00:19:11 -04:30
José Lorenzo Rodríguez
375dde87dc
Migrating ModelDeleteTest to phpunit
2010-05-31 23:50:03 -04:30
mark_story
7ed67e5959
Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768
2010-05-30 20:30:58 -04:00
mark_story
c98a82c61c
Fixing whitespace.
2010-05-30 20:28:00 -04:00
mark_story
66a8890f4f
Fixing code formatting in test cases.
2010-05-30 12:51:48 -04:00
renan.saddam
c96d074722
Merge branch '1.3' of github.com:cakephp/cakephp into 1.3
2010-05-29 12:23:04 -03:00
renan.saddam
8f5112b8d7
Changing break; to continue; so it will process the next tables on the array, tests added.
2010-05-29 12:22:16 -03:00
Martin Radosta
64adfacd3e
Making DboSource::order() accept an expression object. Fixes issues with
...
sql parsing over quoting special SQL syntax. Tests added. Fixes #747
Signed-off-by: mark_story <mark@mark-story.com>
2010-05-25 23:07:29 -04:00
mark_story
29f2223c6d
Removing hardcoded '__' for virtualField separators. Making it an instance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655 , #730
2010-05-22 00:58:54 -04:00
predominant
6a18b2bc1d
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/basics.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/libs/controller/components/request_handler.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/sanitize.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Juan Basso
a94b9ee95b
Update various links. Closes #392
2010-05-18 22:15:13 -03:00
Mark Story
79839c07d2
Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711
2010-05-11 23:08:14 -04:00
Mark Story
0648c6604b
Adding some additional tests for possible php4 compatibility issues.
2010-05-11 23:01:40 -04:00
Mark Story
6add43a4bc
Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675
2010-05-11 22:40:56 -04:00
predominant
8f880731c6
Removing closing PHP tags.
2010-05-11 08:27:28 +10:00
predominant
1ec220dac2
Removing closing PHP tags.
2010-05-11 08:07:49 +10:00
Mark Story
1a7dce3af6
Updating DboMysql to fix an issue where virtualFields that were simple
...
aliases to fields on other tables would end up in the wrong place.
Tests added. Fixes #655
2010-05-07 23:26:13 -04:00
Mark Story
745afe888b
Adding more tests for saving records with nulls. Closes #675
2010-05-07 22:23:18 -04:00
Mark Story
f152181c03
Adding tests for saving models with id == null. Closes #675
2010-05-06 22:24:11 -04:00
Mark Story
adf604a966
Merge branch '1.3' into 2.0
...
Conflicts:
cake/console/templates/default/actions/controller_actions.ctp
cake/console/templates/default/views/form.ctp
cake/console/templates/default/views/index.ctp
cake/console/templates/default/views/view.ctp
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
af6435ece8
Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623
2010-04-25 00:22:57 -07:00
ADmad
46df1be384
Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272
2010-04-25 02:34:18 +05:30
predominant
015872445b
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/libs/acl.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
Mark Story
f86d0de5ee
Adding test to show correct functioning of containable + field() + recursive = -1. Closes #409
2010-04-19 23:16:59 -04:00
Mark Story
029d2581af
Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476
2010-04-19 22:39:07 -04:00
predominant
92215e1795
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/libs/inflector.php
cake/libs/view/helpers/text.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
José Lorenzo Rodríguez
9d2819970d
Fixing schema generation for postgres. Now character varying without lenght is translated to "text", to avoid sql errors. Closes #564
2010-04-13 01:08:31 -04:30
predominant
52cdef900b
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/dispatcher.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/tree.php
cake/libs/router.php
cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
José Lorenzo Rodríguez
7668894888
Fixing error introduced by previous commit
2010-04-07 09:51:29 -04:30
predominant
e4d292bfa4
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/console/libs/shell.php
cake/libs/controller/components/acl.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/security.php
cake/libs/controller/components/session.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/number.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/text.php
cake/libs/view/helpers/time.php
cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5
Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379
2010-04-05 21:50:28 -04:00
predominant
1497ec3910
Changed all public methods to specify public access.
2010-04-05 13:19:38 +10:00
José Lorenzo Rodríguez
45ccba5d94
Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524
2010-04-04 13:24:39 -04:30
predominant
3c2e7a091d
Changed access to private __associations on Model to associations() calls.
2010-04-04 18:17:43 +10:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
predominant
329a13fe5f
Changed all $_ declared variables to protected.
2010-04-04 16:36:12 +10:00
José Lorenzo Rodríguez
75900883e6
Making DboPostgres::value() return NULL when given an empty array, as DboMysql does
2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
bbf96567eb
Using value() in default value generation with CakeSchema and DboPostgres
2010-03-29 23:50:40 -04:30
Mark Story
068631ebe2
Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added.
2010-03-28 16:59:24 -04:00