Commit graph

899 commits

Author SHA1 Message Date
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
ADmad
d365fafe4d Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false 2010-03-28 05:29:42 +05:30
Mark Story
0c29fd0094 Merge remote branch 'origin/1.2' into 1.3
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
2010-03-27 11:48:49 -04:00
José Lorenzo Rodríguez
41734503a6 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Supporting Model.* syntax on postgres.
  Changing variable $title to $title_for_layout. Closes #511

Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500 Qouting fields inside postgres functions when prepended a DISTINCT, closes #512 2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d Supporting Model.* syntax on postgres. 2010-03-25 17:33:34 -03:00
ADmad
6a723bb515 Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477 2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
0f876e1a1b Merge branch 'saveAll' into 1.3
* saveAll:
  Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430 Making saveAll() behave like plain save() when suplied empty data array, closes #277 2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
28cb57a92c Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
cceb568520 Skiping some test in model_write test when using postgres as there is no way yet to do joins inside an update statement.
Possible enhancement would be transforming the join conditions into subquerys
2010-03-16 18:46:04 -04:30
José Lorenzo Rodríguez
c51f4076f7 Forcing order on find('all') in test. It is not safe to asume returned row order in postgres 2010-03-16 17:00:20 -04:30
José Lorenzo Rodríguez
201a952218 Fixing test for postgresql, it is no safe to asume the order of the returned results of a joined table 2010-03-16 15:12:27 -04:30
AD7six
0c951b7248 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
661fcd32ab Fixing failing tests in PostgreSQL cause by invalid datatype comparisons and missing id fields. 2010-03-15 23:07:18 -04:00
Mark Story
ea64588a81 Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459 2010-03-15 22:55:14 -04:00
Mark Story
3ab687043e Updating DboPostgres test to reflect changes in test suite. 2010-03-14 19:27:36 -04:00
Mariano Iglesias
1120d0daff Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642 Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:34:57 -03:00
Mark Story
c059cf5175 Implementing cacheMethod(). Helps to solve #458, as it provides features to control and clear method caches. 2010-03-13 22:55:18 -05:00
Mark Story
028668b7a6 Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450 2010-03-13 00:18:51 -05:00
Dieter Plaetinck
9a9bc3643b fix typo in DboPostgresTestDb::testOrderAdditionalParams() 2010-03-10 14:34:17 -04:30
José Lorenzo Rodríguez
cbcd394d0b Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time 2010-03-09 16:09:16 -04:30