mark_story
f847080cbf
Changing more php version strings.
2010-10-03 12:46:03 -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
a4746c7227
Applying patch from 'kworr' to reorder the switch in DboPostgres::value() to fix issues with pgsql 9.0. Fixes #1139
2010-09-24 22:47:18 -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
12d4b52f10
Fixing failing tests in DboMysql and DboPostgres related to localized floats. Refs #1029
2010-08-21 00:49:40 -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
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
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
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
f4cf945e30
Migrating DboSqliteTest to phpunit
2010-06-09 23:33:41 -04:30
José Lorenzo Rodríguez
fd4db4184a
Migrated ConnectionManager to phpunit
2010-06-04 23:47:38 -04:30
predominant
8decc683ac
Numerous 'shoer description' documentation entries updated to contain useful comments.
2010-05-30 01:20:28 +10:00
predominant
f06f0dae8b
Numerous "Enter description here" block comments updated to have meaningful descriptions.
2010-05-30 01:10:48 +10: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
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
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
predominant
6bd9f0f05b
Convert models, datasources and file/folders to new version of translation shortcut function.
2010-04-16 02:00:25 +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
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
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
Nick Baker
3627f3b384
Patching dbo_mysql listDetailedSources. This fixes the broken test in dbo_mysql and solves ticket: 483-cakeshell-show-table-status-errors
...
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-02 13:21:22 -04: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
ebde29f63c
Fixing error in las commit
2010-03-29 23:58:07 -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
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
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
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
renan.saddam
63f7900ba1
Checking if the last query returned a error, tests added. Fixes #72 .
2010-02-17 22:31:00 -03: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
Juan Basso
c4afeb3fe6
Minor optimization on datasource and Mysql[i].
2010-01-20 01:44:59 -04:30
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
predominant
804fba1a22
Adding block comments for Postgres Datasource quotes.
2010-01-05 23:23:23 +11:00
tPl0ch
1eff024e7e
Removed unnessecary connect keys from all Dbo's _baseConfig. Updated connect methods where needed. Fixes #132
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-27 12:47:52 -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
425dcf2df5
Applying patch from 'tPl0ch', connect key is set to 'mysql_connect' when not using persistent connections. Fixes #132
2009-12-22 13:23:55 -05:00
ADmad
33038c75ac
Removing redundant 'isset' check from DboMysql::connect
2009-12-15 20:41:44 +05:30
predominant
df151395c5
Moving certain datasources to the Datasources Plugin ( http://github.com/cakephp/datasources )
2009-12-11 01:07:23 +11:00
renan.saddam
c3bf6bc0e8
Checking for french error on dbo_mssql. Fixes #77 .
2009-12-09 21:20:55 -02:00
renan.saddam
931606f7f5
Checking for french error on dbo_mssql. Fixes #77 .
2009-12-09 21:10:37 -02:00
predominant
13ffd76178
Removing "Long description for file" from /cake/libs tree.
2009-12-08 20:19:02 +11:00
mark_story
1f5c6eac2e
Fixing issues in tests caused by overwritten columns.
...
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
2009-12-06 21:46:05 -05:00
mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
64dffb7663
Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358
2009-11-24 22:49:40 -05:00
mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
Juan Basso
71df8dbbba
Replace function sizeof (alias) by count.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c
Replace function die (alias) by exit.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
renan.saddam
4a8808eb21
Removing the argument passed to mssql_get_last_message(), it does not accept any argument.
2009-11-19 16:35:29 -02:00
renan.saddam
a33bd1d144
Removing the argument passed to mssql_get_last_message(), it does not accept any argument.
2009-11-19 16:28:11 -02:00
predominant
a91108a81a
Adding version check to getCharsetName() for MySQL Datasource.
2009-11-16 13:49:52 +11:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
a3bb77c4f3
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/acl.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/model.php
cake/console/libs/templates/skel/views/layouts/xml/default.ctp
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/validation.php
cake/libs/view/helpers/form.php
cake/tests/cases/basics.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/cake_test_case.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/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/groups/controller.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
23831546b5
Adding valid options for sqlite collation. Tests added.
2009-10-29 02:03:50 -04:00
mark_story
2a8858e928
Adding tests to DboSqlite::buildColumn
...
Adding collate field parameter to DboSqlite.
Removing duplicated code from DboSource, adding parent call instead.
2009-10-29 01:36:15 -04:00
mark_story
5a093e5627
Fixing issues in postgres with time columns and '' values.
...
Tests added.
Fixes #213
2009-10-27 13:22:34 -04:00
mark_story
14bd47842c
Removing length() from DboMysqli, fixes incorrect float length parsing.
...
Test case added.
2009-10-24 11:06:27 -04:00
mark_story
c6999aea7f
Moving DboMysqli::describe() and DboMysql::describe() into DboMysqlBase. Removes duplicated method code.
2009-10-24 10:46:28 -04:00
mark_story
072e1efc13
Adding Datasource::enabled()
...
Allows for checking a datasource's ability to be used before attempting to connect it.
Added enabled() to all the core dbo's.
Fixes whitescreen when trying to use a non installed database driver.
Fixes #131
2009-10-20 16:11:31 -04:00
mark_story
d1f5acd0e0
Merge commit 'origin/1.2' into 1.2-merge-in
...
Conflicts:
cake/console/libs/shell.php
cake/libs/model/connection_manager.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
6e9ca4367e
Fixing connection methods in DboSybase. Fixes #145
2009-10-06 09:21:43 -04:00
mark_story
d2bf31f69f
Fixing broken tests in dbo_mysql caused by changes in CakeSchema.
...
Adding tableParameter altering to DboMysql.
Tests added.
2009-10-04 21:48:20 -04:00
mark_story
7b0bc014cc
Updating whitespacing.
2009-10-04 20:54:27 -04:00
mark_story
0b6d6cee6c
Adding placeholder method to DboMysql to handle alteration of table parameter statement generation.
2009-10-03 16:49:01 -04:00
mark_story
4094f0a696
Moving DboMysql::listDetailedSources() and DboMysql::getCharsetName() into DboMysqlBase so it works with mysqli as well. Tests added for MySqli.
2009-09-30 00:39:32 -04:00
mark_story
dc220bbb21
Fixing DboSybase::connect() to use port configuration value. Thanks 'tPl0ch' for the various attempts :) Fixes #90
2009-09-29 20:43:17 -04:00
SkieDr
627eff5f24
Implementation of table level and field level parameters support
2009-09-29 22:54:48 +04:00
mark_story
34deb2a18d
Correcting omission of group in DboOracle. Fixes #98
2009-09-23 23:16:57 -04:00
mark_story
5717e3b59c
Merge branch '1.2' into 1.2-merger
...
Conflicts:
app/webroot/test.php
cake/VERSION.txt
cake/bootstrap.php
cake/config/config.php
cake/console/cake.php
cake/console/libs/schema.php
cake/console/templates/skel/webroot/test.php
cake/libs/configure.php
cake/tests/cases/console/libs/schema.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
793c6ec07a
Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91
2009-09-15 22:00:49 -04:00
mark_story
2c633912e0
Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91
2009-09-15 22:00:04 -04:00
mark_story
326424592d
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/libs/inflector.php
cake/libs/view/view.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
jperras
2484179e36
DboMssql::value() now returns NULL for numeric column types (float, integer, binary) when the column data is empty. Fixes #28 .
2009-09-06 13:57:24 -04:00
renan.saddam
0e9007e060
Making sure we are not making non-uniques and non-primary keys index. Also changing basic fixture schema to make tests pass.
2009-09-02 22:07:58 -03:00
