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
|
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
|
e15069769d
|
Adding tests for #1079 and fixing some formatting.
|
2010-09-07 00:09:06 -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 |
|
ADmad
|
bfaaa6b8ba
|
Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' associated models. Closes #995
|
2010-09-05 23:53:24 +05:30 |
|
mark_story
|
ea9e30890f
|
Adding a workaround to DboSource::showLog() to work around fix added in [da9c0da626 ].
Also adding explanation message when logs are not generated.
|
2010-08-26 21:24:09 -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 |
|
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 |
|
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
|
02e25f7557
|
Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503
|
2010-07-05 21:50:36 -04:00 |
|
mark_story
|
2020675078
|
Merge branch '1.3' into 2.0
Conflicts:
cake/dispatcher.php
cake/tests/cases/libs/controller/components/request_handler.test.php
|
2010-06-30 22:47:27 -04:00 |
|
mark_story
|
e023350af5
|
Updating API docs related to DboSource::$cacheMethods. Fixes #870
|
2010-06-30 08:52:39 -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 |
|
José Lorenzo Rodríguez
|
c23fe5d72e
|
Migrating ModelReadTest to PHPUnit
|
2010-06-04 23:07:29 -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 |
|
predominant
|
8decc683ac
|
Numerous 'shoer description' documentation entries updated to contain useful comments.
|
2010-05-30 01:20:28 +10: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 |
|
Juan Basso
|
2d44929598
|
Optimization on dbo datasource to not repeat ids in find. Fixes #601
Signed-off-by: mark_story <mark@mark-story.com>
|
2010-05-23 17:22:55 -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
|
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 |
|
predominant
|
c7fcaf995f
|
Convert getMictime() php4 hack to microtime(true)
|
2010-04-16 02:58:28 +10:00 |
|
predominant
|
6bd9f0f05b
|
Convert models, datasources and file/folders to new version of translation shortcut function.
|
2010-04-16 02:00:25 +10:00 |
|
predominant
|
a4cf737947
|
Fixing access specified on DboSource.
|
2010-04-11 15:25:18 +10:00 |
|
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 |
|
predominant
|
50a547167b
|
Changing protected methods to specify protected access.
|
2010-04-05 13:21:28 +10: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 |
|
predominant
|
29dc12dbc2
|
Changed all $__ declared variables to private.
|
2010-04-04 16:33:39 +10:00 |
|
José Lorenzo Rodríguez
|
1f1324f500
|
Qouting fields inside postgres functions when prepended a DISTINCT, closes #512
|
2010-03-25 16:05:45 -04:30 |
|
ADmad
|
e2113e4aa2
|
Minor optimization in DboSource::__scrubQueryData(), removing unneded isset() check.
|
2010-03-18 03:02:58 +05:30 |
|
José Lorenzo Rodríguez
|
c1f74c28ae
|
Fixing postgres self join error
|
2010-03-16 16:49:57 -04:30 |
|
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
|
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
|
5e665b32f2
|
Removing useless condition in DboSource::cacheMethod()
|
2010-03-15 00:41:44 -04:00 |
|
Mark Story
|
32432e8de6
|
Updating DboSource::conditions() to use cacheMethod(). Refs #458
|
2010-03-13 23:00:08 -05: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 |
|
Dieter Plaetinck
|
a79ff508a6
|
fix compliancy with more elaborate ORDER syntax, such as "DESC NULLS FIRST" in postgresql, in DboSource::order()
|
2010-03-09 14:12:54 -04:30 |
|
José Lorenzo Rodríguez
|
e4a5ca528c
|
Fixing virutal fields fetching for postgresql, closes #417
|
2010-03-05 16:07:59 -04:30 |
|
Mark Story
|
3e275494e1
|
Removing duplicated condition from merge.
|
2010-03-03 20:07:23 -05:00 |
|
José Lorenzo Rodríguez
|
6ae54fda8d
|
Using the method cache for the rest of the return statements in DboSource::name
|
2010-02-23 10:09:11 -04:30 |
|
Mark Story
|
7075aa5e86
|
Fixing DboSource not quoting table/field names with - in them. Tests expanded . Fixes #323
|
2010-02-20 11:42:17 -05:00 |
|
Mark Story
|
6a3347ef7c
|
Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/libs/tasks/model.php
cake/dispatcher.php
cake/libs/l10n.php
cake/libs/model/datasources/dbo_source.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/text.test.php
|
2010-02-20 01:32:04 -05:00 |
|
Mark Story
|
fc499ac48f
|
Reversing order of short cut checks. Fixes issues in PHP 5.1.x. Fixes #351
|
2010-02-16 22:05:50 -05:00 |
|
José Lorenzo Rodríguez
|
3f9813a9ec
|
Removing unused statement, thanks jrbasso
|
2010-01-29 16:15:03 -04:30 |
|
José Lorenzo Rodríguez
|
1dd0a6470c
|
Optimizations for DbouSource.
Now the result for some methods is stored in a memory cache inside the poperty $methodCache
|
2010-01-29 10:57:40 -04:30 |
|
Juan Basso
|
57997e770c
|
Refactory of DboSource::name() to improve performance. Added more tests to it.
Signed-off-by: Mark Story <mark@mark-story.com>
|
2010-01-27 12:24:06 -05:00 |
|
Mark Story
|
4f67f84ff8
|
Merge branch '1.2' into 1.3-merger
Conflicts:
app/config/acl.ini.php
app/config/bootstrap.php
app/config/core.php
app/config/database.php.default
app/config/inflections.php
app/config/routes.php
app/config/schema/db_acl.php
app/config/schema/i18n.php
app/config/schema/sessions.php
app/config/sql/db_acl.sql
app/config/sql/i18n.sql
app/index.php
app/webroot/css.php
app/webroot/css/cake.generic.css
app/webroot/index.php
app/webroot/js/vendors.php
app/webroot/test.php
cake/LICENSE.txt
cake/basics.php
cake/bootstrap.php
cake/config/config.php
cake/config/paths.php
cake/config/unicode/casefolding/0080_00ff.php
cake/config/unicode/casefolding/0100_017f.php
cake/config/unicode/casefolding/0180_024F.php
cake/config/unicode/casefolding/0250_02af.php
cake/config/unicode/casefolding/0370_03ff.php
cake/config/unicode/casefolding/0400_04ff.php
cake/config/unicode/casefolding/0500_052f.php
cake/config/unicode/casefolding/0530_058f.php
cake/config/unicode/casefolding/1e00_1eff.php
cake/config/unicode/casefolding/1f00_1fff.php
cake/config/unicode/casefolding/2100_214f.php
cake/config/unicode/casefolding/2150_218f.php
cake/config/unicode/casefolding/2460_24ff.php
cake/config/unicode/casefolding/2c00_2c5f.php
cake/config/unicode/casefolding/2c60_2c7f.php
cake/config/unicode/casefolding/2c80_2cff.php
cake/config/unicode/casefolding/ff00_ffef.php
cake/console/cake
cake/console/cake.bat
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/api.php
cake/console/libs/bake.php
cake/console/libs/console.php
cake/console/libs/i18n.php
cake/console/libs/schema.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/tasks/test.php
cake/console/libs/tasks/view.php
cake/console/libs/templates/skel/config/bootstrap.php
cake/console/libs/templates/skel/config/inflections.php
cake/console/libs/templates/skel/config/sql/sessions.sql
cake/console/libs/templates/skel/index.php
cake/console/libs/templates/skel/views/elements/email/html/default.ctp
cake/console/libs/templates/skel/views/elements/email/text/default.ctp
cake/console/libs/templates/skel/views/layouts/ajax.ctp
cake/console/libs/templates/skel/views/layouts/default.ctp
cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
cake/console/libs/templates/skel/webroot/js/vendors.php
cake/console/libs/templates/skel/webroot/test.php
cake/console/libs/templates/views/form.ctp
cake/console/libs/templates/views/index.ctp
cake/console/libs/testsuite.php
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/app_controller.php
cake/console/templates/skel/app_helper.php
cake/console/templates/skel/app_model.php
cake/console/templates/skel/config/acl.ini.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/config/routes.php
cake/console/templates/skel/config/schema/db_acl.php
cake/console/templates/skel/config/schema/db_acl.sql
cake/console/templates/skel/config/schema/i18n.php
cake/console/templates/skel/config/schema/i18n.sql
cake/console/templates/skel/config/schema/sessions.php
cake/console/templates/skel/config/schema/sessions.sql
cake/console/templates/skel/controllers/pages_controller.php
cake/console/templates/skel/views/layouts/flash.ctp
cake/console/templates/skel/webroot/css.php
cake/console/templates/skel/webroot/css/cake.generic.css
cake/console/templates/skel/webroot/index.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cache/apc.php
cake/libs/cache/file.php
cake/libs/cache/memcache.php
cake/libs/cache/xcache.php
cake/libs/cake_log.php
cake/libs/cake_session.php
cake/libs/cake_socket.php
cake/libs/class_registry.php
cake/libs/configure.php
cake/libs/controller/app_controller.php
cake/libs/controller/component.php
cake/libs/controller/components/acl.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/components/session.php
cake/libs/controller/controller.php
cake/libs/controller/pages_controller.php
cake/libs/controller/scaffold.php
cake/libs/debugger.php
cake/libs/error.php
cake/libs/file.php
cake/libs/flay.php
cake/libs/folder.php
cake/libs/http_socket.php
cake/libs/i18n.php
cake/libs/inflector.php
cake/libs/l10n.php
cake/libs/magic_db.php
cake/libs/model/app_model.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/translate.php
cake/libs/model/behaviors/tree.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/datasource.php
cake/libs/model/datasources/dbo/dbo_adodb.php
cake/libs/model/datasources/dbo/dbo_db2.php
cake/libs/model/datasources/dbo/dbo_firebird.php
cake/libs/model/datasources/dbo/dbo_mssql.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/datasources/dbo/dbo_odbc.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/datasources/dbo/dbo_postgres.php
cake/libs/model/datasources/dbo/dbo_sqlite.php
cake/libs/model/datasources/dbo/dbo_sybase.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/db_acl.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/multibyte.php
cake/libs/object.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/sanitize.php
cake/libs/security.php
cake/libs/set.php
cake/libs/string.php
cake/libs/validation.php
cake/libs/view/elements/dump.ctp
cake/libs/view/elements/email/html/default.ctp
cake/libs/view/elements/email/text/default.ctp
cake/libs/view/errors/error404.ctp
cake/libs/view/errors/missing_action.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/helper.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/app_helper.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/number.php
cake/libs/view/helpers/paginator.php
cake/libs/view/helpers/rss.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
cake/libs/view/layouts/ajax.ctp
cake/libs/view/layouts/default.ctp
cake/libs/view/layouts/email/html/default.ctp
cake/libs/view/layouts/email/text/default.ctp
cake/libs/view/layouts/flash.ctp
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/theme.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/basics.test.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/schema.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/extract.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cache/file.test.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cache/xcache.test.php
cake/tests/cases/libs/cake_log.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_socket.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/class_registry.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/acl.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/email.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/controller_merge_vars.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/file.test.php
cake/tests/cases/libs/flay.test.php
cake/tests/cases/libs/folder.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/l10n.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/behaviors/containable.test.php
cake/tests/cases/libs/model/behaviors/translate.test.php
cake/tests/cases/libs/model/behaviors/tree.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.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/dbo_oracle.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/model/db_acl.test.php
cake/tests/cases/libs/model/model.test.php
cake/tests/cases/libs/model/model_behavior.test.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/model/model_integration.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/model/model_validation.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/multibyte.test.php
cake/tests/cases/libs/object.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/sanitize.test.php
cake/tests/cases/libs/security.test.php
cake/tests/cases/libs/set.test.php
cake/tests/cases/libs/string.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helper.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/number.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/cases/libs/view/helpers/rss.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/text.test.php
cake/tests/cases/libs/view/helpers/time.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/account_fixture.php
cake/tests/fixtures/aco_action_fixture.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/aco_two_fixture.php
cake/tests/fixtures/advertisement_fixture.php
cake/tests/fixtures/another_article_fixture.php
cake/tests/fixtures/apple_fixture.php
cake/tests/fixtures/aro_fixture.php
cake/tests/fixtures/aro_two_fixture.php
cake/tests/fixtures/aros_aco_fixture.php
cake/tests/fixtures/aros_aco_two_fixture.php
cake/tests/fixtures/article_featured_fixture.php
cake/tests/fixtures/article_featureds_tags_fixture.php
cake/tests/fixtures/article_fixture.php
cake/tests/fixtures/articles_tag_fixture.php
cake/tests/fixtures/attachment_fixture.php
cake/tests/fixtures/auth_user_custom_field_fixture.php
cake/tests/fixtures/auth_user_fixture.php
cake/tests/fixtures/author_fixture.php
cake/tests/fixtures/basket_fixture.php
cake/tests/fixtures/bid_fixture.php
cake/tests/fixtures/binary_test_fixture.php
cake/tests/fixtures/book_fixture.php
cake/tests/fixtures/cache_test_model_fixture.php
cake/tests/fixtures/callback_fixture.php
cake/tests/fixtures/category_fixture.php
cake/tests/fixtures/category_thread_fixture.php
cake/tests/fixtures/cd_fixture.php
cake/tests/fixtures/comment_fixture.php
cake/tests/fixtures/content_account_fixture.php
cake/tests/fixtures/content_fixture.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
cake/tests/fixtures/data_test_fixture.php
cake/tests/fixtures/datatype_fixture.php
cake/tests/fixtures/dependency_fixture.php
cake/tests/fixtures/device_fixture.php
cake/tests/fixtures/device_type_category_fixture.php
cake/tests/fixtures/device_type_fixture.php
cake/tests/fixtures/document_directory_fixture.php
cake/tests/fixtures/document_fixture.php
cake/tests/fixtures/exterior_type_category_fixture.php
cake/tests/fixtures/feature_set_fixture.php
cake/tests/fixtures/featured_fixture.php
cake/tests/fixtures/film_file_fixture.php
cake/tests/fixtures/flag_tree_fixture.php
cake/tests/fixtures/fruit_fixture.php
cake/tests/fixtures/fruits_uuid_tag_fixture.php
cake/tests/fixtures/home_fixture.php
cake/tests/fixtures/image_fixture.php
cake/tests/fixtures/item_fixture.php
cake/tests/fixtures/items_portfolio_fixture.php
cake/tests/fixtures/join_a_b_fixture.php
cake/tests/fixtures/join_a_c_fixture.php
cake/tests/fixtures/join_a_fixture.php
cake/tests/fixtures/join_b_fixture.php
cake/tests/fixtures/join_c_fixture.php
cake/tests/fixtures/join_thing_fixture.php
cake/tests/fixtures/message_fixture.php
cake/tests/fixtures/my_categories_my_products_fixture.php
cake/tests/fixtures/my_categories_my_users_fixture.php
cake/tests/fixtures/my_category_fixture.php
cake/tests/fixtures/my_product_fixture.php
cake/tests/fixtures/my_user_fixture.php
cake/tests/fixtures/node_fixture.php
cake/tests/fixtures/number_tree_fixture.php
cake/tests/fixtures/number_tree_two_fixture.php
cake/tests/fixtures/numeric_article_fixture.php
cake/tests/fixtures/overall_favorite_fixture.php
cake/tests/fixtures/person_fixture.php
cake/tests/fixtures/portfolio_fixture.php
cake/tests/fixtures/post_fixture.php
cake/tests/fixtures/posts_tag_fixture.php
cake/tests/fixtures/primary_model_fixture.php
cake/tests/fixtures/product_fixture.php
cake/tests/fixtures/project_fixture.php
cake/tests/fixtures/sample_fixture.php
cake/tests/fixtures/secondary_model_fixture.php
cake/tests/fixtures/session_fixture.php
cake/tests/fixtures/something_else_fixture.php
cake/tests/fixtures/something_fixture.php
cake/tests/fixtures/stories_tag_fixture.php
cake/tests/fixtures/story_fixture.php
cake/tests/fixtures/syfile_fixture.php
cake/tests/fixtures/tag_fixture.php
cake/tests/fixtures/test_plugin_article_fixture.php
cake/tests/fixtures/test_plugin_comment_fixture.php
cake/tests/fixtures/the_paper_monkies_fixture.php
cake/tests/fixtures/thread_fixture.php
cake/tests/fixtures/translate_article_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/fixtures/translate_table_fixture.php
cake/tests/fixtures/translated_article_fixture.php
cake/tests/fixtures/translated_item_fixture.php
cake/tests/fixtures/unconventional_tree_fixture.php
cake/tests/fixtures/underscore_field_fixture.php
cake/tests/fixtures/user_fixture.php
cake/tests/fixtures/uuid_fixture.php
cake/tests/fixtures/uuid_tag_fixture.php
cake/tests/fixtures/uuid_tree_fixture.php
cake/tests/fixtures/uuiditem_fixture.php
cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
cake/tests/fixtures/uuidportfolio_fixture.php
cake/tests/groups/acl.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/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_reporter.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_fixture.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/cli_reporter.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/templates/footer.php
cake/tests/lib/templates/header.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/lib/xdebug.php
cake/tests/test_app/config/acl.ini.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/controllers/tests_apps_posts_controller.php
cake/tests/test_app/models/behaviors/persister_one_behavior.php
cake/tests/test_app/models/behaviors/persister_two_behavior.php
cake/tests/test_app/models/comment.php
cake/tests/test_app/models/persister_one.php
cake/tests/test_app/models/persister_two.php
cake/tests/test_app/models/post.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/tests_controller.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.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/shells/example.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/plugins/test_plugin_two/vendors/shells/example.php
cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.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/html/default.ctp
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/elements/email/text/wide.ctp
cake/tests/test_app/views/layouts/ajax.ctp
cake/tests/test_app/views/layouts/ajax2.ctp
cake/tests/test_app/views/layouts/cache_layout.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/layouts/email/html/default.ctp
cake/tests/test_app/views/layouts/email/html/thin.ctp
cake/tests/test_app/views/layouts/email/text/default.ctp
cake/tests/test_app/views/layouts/flash.ctp
cake/tests/test_app/views/layouts/multi_cache.ctp
cake/tests/test_app/views/posts/sequencial_nocache.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
index.php
|
2010-01-26 17:54:34 -05:00 |
|
Mark Story
|
66a8910810
|
Fixing cakephp domain name.
|
2010-01-26 17:15:15 -05:00 |
|
Mark Story
|
527eec1a54
|
Fixing doc tags to make merge easier.
|
2010-01-26 16:51:53 -05:00 |
|
Mark Story
|
f6d12dbde6
|
Adding support for CURRENT_TIMESTAMP to all dbo's.
|
2010-01-25 12:25:14 -05:00 |
|
Mark Story
|
5d35fd8d38
|
Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250
|
2010-01-22 10:30:22 -05:00 |
|
Mark Story
|
913450daef
|
Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208
|
2010-01-21 10:35:20 -05:00 |
|
Mark Story
|
e1b0c41254
|
Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field as field . This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220
|
2010-01-19 09:22:13 -05:00 |
|
Mark Story
|
080e34718d
|
Minor refactor, and adding tests from previous commit. Fixes #208
|
2010-01-18 21:57:03 -05:00 |
|
AD7six
|
7943f3d168
|
allowing vritual fields to work whether specified with a model alias or
not. by concequence allows find('list', array('fields' => array('id',
'virtual'))) to work
|
2010-01-18 21:54:15 -05:00 |
|
Juan Basso
|
473e07a674
|
Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
|
2010-01-18 01:06:25 -05:00 |
|
Joël Perras
|
15b8a3ec71
|
Updating copyright date on all files.
|
2010-01-13 23:47:14 -05:00 |
|
José Lorenzo Rodríguez
|
aa9258cbd1
|
Adding test for DboSource::group() and virtual fields
Closes #184
|
2010-01-11 12:22:59 -04:30 |
|
José Lorenzo Rodríguez
|
3fe4b46614
|
Fixing DboSource::group() to test for virtual fields when first parameter is not an array
|
2010-01-11 12:06:27 -04:30 |
|
José Lorenzo Rodríguez
|
cecfd72f28
|
Fixing parse error in php 4
|
2010-01-11 11:51:55 -04:30 |
|
Phally
|
bbb105fc8c
|
Added virtual field support for GROUP BY.
|
2010-01-11 11:46:59 -04:30 |
|
Mark Story
|
4ada5b7eea
|
Fixing notice errors caused by incorrect datatyping in php4.
|
2010-01-11 09:44:51 -05:00 |
|
Mark Story
|
896414e632
|
Fixing parse error in PHP4 caused by optional arguments with default
values being passed by reference. Fixes #180
|
2010-01-11 09:40:56 -05:00 |
|
Mark Story
|
8b93235847
|
Fixing auto merge issues.
|
2009-12-27 12:45:34 -05:00 |
|
Mark Story
|
7a620b62b0
|
Merge branch '1.3-misc' into mergers
Conflicts:
cake/libs/model/datasources/dbo_source.php
cake/libs/view/helpers/js.php
|
2009-12-27 12:45:12 -05:00 |
|
Mark Story
|
6b2154d961
|
Merge branch '1.2' into mergers
Conflicts:
cake/libs/inflector.php
cake/tests/cases/libs/model/model_validation.test.php
|
2009-12-27 12:34:27 -05:00 |
|
Mark Story
|
4ac0a55aff
|
Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
|
2009-12-19 19:40:12 -05:00 |
|
Mark Story
|
7387cfdf6b
|
Adding @access tags and expanding doc blocks.
|
2009-12-19 13:06:32 -05:00 |
|
Mark Story
|
7fd9b5ae3b
|
Removing auto dump of sql log.
|
2009-12-19 12:40:32 -05:00 |
|
Mark Story
|
a89fcba243
|
Updating DboSource::getLog() and showLog() to use a View element.
Updating tests to reflect changes in getLog()
|
2009-12-19 12:09:01 -05:00 |
|
Mark Story
|
cbb29dcc5d
|
Extracting sql dump generation into a view element.
Changing the behavior of DboSource::getLog().
Adding sql dump element to layout.
|
2009-12-19 12:09:01 -05:00 |
|
Mark Story
|
959befb6e1
|
Merge commit 'josezap/virtual-fields' into virtual-fields
|
2009-12-18 19:11:50 -05:00 |
|
José Lorenzo Rodríguez
|
8f29f59c1a
|
Enclosing virtual fields in parentheses to avoid SQL errors
Added new tests to improve code coverage on virtual fields
|
2009-12-17 14:42:46 -04:30 |
|
Mark Story
|
b190e462b8
|
Fixing whitespacing.
|
2009-12-17 00:15:42 -05:00 |
|
Mark Story
|
02330b2d9c
|
Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
Tests added
Fixes #66
|
2009-12-13 15:52:07 -05:00 |
|
José Lorenzo Rodríguez
|
c65e2f3f18
|
Quoting virtual fields in automatically
Updating test cases
|
2009-12-10 20:46:55 -04:30 |
|
José Lorenzo Rodríguez
|
8c4cad86c2
|
Fixing erroris due to bad rebase
|
2009-12-10 20:35:24 -04:30 |
|
José Lorenzo Rodríguez
|
4b9e03c9f7
|
Creating accesor methods for virtual fields and replacing direct access from DboSource with new methods
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
7a7d0de988
|
Adding support for virtual fields in DboSourse::calculate
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
d06ff5d10a
|
Adding support for virtual fields in conditions array
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
cf359a38b3
|
Re-adding ability to order by virtual fields in DboSource::order
Adding support for paginating virtual model fields in controller
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
051d352eab
|
Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster)
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
5a58813031
|
Making DboSource order by virtual fields
|
2009-12-10 20:08:13 -04:30 |
|
José Lorenzo Rodríguez
|
7efafc685e
|
Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
|
2009-12-10 20:08:13 -04:30 |
|
José Lorenzo Rodríguez
|
a81edb6080
|
Extending virtual fields implementation to work on queries with field list
|
2009-12-10 20:07:46 -04:30 |
|
José Lorenzo Rodríguez
|
53765312df
|
Initial implementation of model virtual fields
|
2009-12-10 20:07:07 -04:30 |
|
José Lorenzo Rodríguez
|
285329e7a4
|
Fake commit
|
2009-12-10 20:05:11 -04:30 |
|
José Lorenzo Rodríguez
|
ec672e99e8
|
Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
|
2009-12-10 20:05:10 -04:30 |
|
José Lorenzo Rodríguez
|
00c0bb4d62
|
Extending virtual fields implementation to work on queries with field list
|
2009-12-10 20:01:58 -04:30 |
|
José Lorenzo Rodríguez
|
19c91f1f70
|
Initial implementation of model virtual fields
|
2009-12-10 20:01:58 -04:30 |
|
predominant
|
13ffd76178
|
Removing "Long description for file" from /cake/libs tree.
|
2009-12-08 20:19:02 +11:00 |
|
mark_story
|
02f9275e20
|
Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data.
|
2009-11-28 23:02:59 -05:00 |
|