Commit graph

844 commits

Author SHA1 Message Date
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
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
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
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
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
Juan Basso
c4afeb3fe6 Minor optimization on datasource and Mysql[i]. 2010-01-20 01:44:59 -04:30
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
Joël Perras
4d1f6b82e8 Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100. 2010-01-13 23:19:10 -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
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
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
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
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
13ffcbc0ba Updating doc blocks in Datasource. Adding missing reference operators. 2009-12-19 13:23:46 -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
ADmad
33038c75ac Removing redundant 'isset' check from DboMysql::connect 2009-12-15 20:41:44 +05:30
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
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
24b636cc71 Merge branch 'mergers' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/text.php
	cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05: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
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
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
mark_story
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -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
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
63ab96d751 Setting $primary = false inside DboSource::queryAssociation. Fixed #208 2009-11-15 17:48:41 -05: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
5f1e6ba6a0 Making DboSource::fetchAll return $this->_result if it is a boolean and $out is empty. Allows for Model::query() to return boolean values for operations that do not return recordsets. Fixes #6404 2009-10-29 20:31:29 -04:00
mark_story
23831546b5 Adding valid options for sqlite collation. Tests added. 2009-10-29 02:03:50 -04:00
mark_story
a33457155f Adding valid option checking to fieldParameters.
Test case added.
2009-10-29 02:03:21 -04:00
mark_story
f299283dc4 Refactoring duplicated code into a method. 2009-10-29 01:47:25 -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
0a79822b9d Expanding some doc blocks for DataSource. 2009-10-19 21:09:47 -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
7d4510b959 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 2009-09-30 14:26:38 -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
6dbba17d1b Fixing issues with DboSource::execute() where queries would not be run if stats = false in the options. Tests added. 2009-09-30 00:37:06 -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
5a432c6f71 Applying fix from Ceeram for updateAll joins on model relations with no foreign key. Fixes #69. 2009-09-09 00:00:53 -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
mark_story
c0a19ced14 Adding DboSource::getLog() and test case. 2009-09-01 23:23:47 -04:00
jperras
e9cfb66424 Fixing calling of method from incorrect object in DboOracle::describe(). Fixes #21. 2009-08-23 17:52:40 -04:00
mark_story
cca3281f8c Fixing complex expression handling in DboSource::fields(). Making AS a variable controlled by implementing dbo.
Test cases added.
Fixes #38
2009-08-19 13:03:36 -04:00
AD7six
a4bc755cc7 whitespace normalization 2009-08-02 16:10:24 -07:00
gwoo
15ed658a27 Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
gwoo
d118c6a764 Merge branch '1.3-newlines' into 1.3 2009-08-02 12:08:55 -07:00
gwoo
7fc465309e Merge branch '1.2' into 1.3 2009-08-02 11:58:39 -07:00
jperras
e9e8951a27 Updating doc blocks for datasource - thanks to savant for patch. Fixes #5738.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8270 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 18:52:55 +00:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
jperras
5172035e02 Adding table prefix detection for sequence maps in DboOracle::describe(). Fixes #6527.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8268 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 19:40:52 +00:00
gwoo
887f8335ee fixes #6539 quoting in buildIndex
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8267 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 18:25:25 +00:00
renan.saddam
76e50ef625 Adding support for Model.* syntax, which translates to a list of fields from Model.
Fixing buildColumn for null values.
Fixing small containable merge, it was duplicating values, tests added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8265 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 02:08:20 +00:00
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07:00
renan.saddam
90445e9119 Fixing "DEFAULT NULL" sentence, which for some reason does not work. It needs to be only "NULL", and "DEFAULT NULL NULL" works too.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8263 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-30 00:00:19 +00:00
renan.saddam
ee8d12c939 Fixing issue with "DEFAULT NULL NULL" generated by buildColumn.
Making the tests pass by just changing the start and end quotes.
Providing "created" values for CakeTestFixtureTestFixture Fixture.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8262 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-29 22:30:20 +00:00
DarkAngelBGE
f710ae7fbe Minor refactorings + fix for dbo mysqli related to previous commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8261 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:08:24 +00:00
DarkAngelBGE
f88cc56cfe Coding standards fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8260 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:01:42 +00:00
AD7six
fd0aaefb39 whitespace normalization 2009-07-26 12:46:07 +02:00
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
93d64c4e76 Removing use of e() from core classes. Refs #6525
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 13:35:14 +00:00
nate
a75d1fad2a Modifying quoting method used in conditions with array values in DboSource, fixes #6519
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8243 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-22 01:50:11 +00:00
DarkAngelBGE
fefbe77208 Minor refactorings for DboMysql, DboSource and TextHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +00:00
gwoo
f2b7a26be8 fixes #5710, HABTM - constraining unique ids, but removing non-unique
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8217 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 03:31:05 +00:00
gwoo
92b8e87ed7 fix for cross database joins when recursive < 1
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8212 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:14:38 +00:00
DarkAngelBGE
d9489b942b Removing duplicate START TRANSACTION sql execution in mysqli environment, fixes #6422
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8191 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-06 15:41:33 +00:00
mark_story
2c1b7fc24e Adding nullish value handling for date, datetime, and timestamp column types to DboPostgres. Empty string values now return instead of "". Fixes #6386
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8190 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-05 02:43:08 +00:00
mark_story
a9bbae31ee Fixing primary key column length in DboSqlite. UUID primary keys now return defined length.
Test cases added for describe()
Fixes #6412

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8184 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:03:51 +00:00
mark_story
f498ba0a87 Adding german error string to dbo_mssql::lastError() Fixes #6352
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8180 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-29 02:59:30 +00:00
renan.saddam
975ddaa4be Fixes #6135: Primary Key detection and load record fixtures on mssql. Tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8161 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-29 16:26:03 +00:00
gwoo
9ab6339392 fixes #6240, DboOracle: fix cache sources and php version compatibility
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8154 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:06:46 +00:00
nate
cb95f13608 Correcting issue in String::insert() where 0 offsets were handled incorrectly, affecting issue where values were not properly quoted and inserted into conditions strings. Fixes #6163.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8085 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 20:03:02 +00:00
nate
eea46e7cc8 Fixing issue where calculated columns were getting quoted incorrectly. Test included. Reformatting code to be 100 characters or less.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8084 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-09 18:36:32 +00:00
mark_story
ffc537aaa8 Minor optimization. Removing additional variable assignment.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8077 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 03:54:52 +00:00
mark_story
2a139b171c Applying patch from 'farhadi' correcting regular expression when using magic findBy and fields that contain findBy in them. Fixes #6138
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8057 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 03:22:31 +00:00
mark_story
ce4fa20f3f Fixing escaping of fields in hasAny() also adding in correct model aliases.
Tests added. 
Fixes #6089

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8032 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-15 21:05:42 +00:00
mark_story
d3ee6b31f1 Added conditional check for compatibility with MySQL 4.x result sets to DboMySqlBase::index(). Tests added. Thanks to 'teknoid' for the help. Closes #4503
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8020 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-08 23:09:08 +00:00
mark_story
4b00c29eef Updating doc blocks to improve readability in API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
nate
d75b063dca Correcting quoted-alias replacement in DboSource, adding (and mocking) MS SQL test, fixes #5942
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8003 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-16 19:08:44 +00:00
AD7six
704188e2b9 correcting shorthand if else statement
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7996 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 00:01:19 +00:00
mark_story
4a636b93a8 Fixing showQuery() when there is $error = false. Tests from 'zackenbarsch' added. Fixes #5983
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7978 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 04:12:46 +00:00
phishy
afe9970157 Fixes #5939
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7965 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-29 21:37:01 +00:00
nate
a5b7276696 Correcting DboSource::order() identifier quoting, correcting bad DboSource tests, fixes #5900
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7942 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-18 20:49:25 +00:00
mark_story
ea9c080b1c Adding alterSchema() to dbo_postgres. Also handles index alters. Tests added for field and index alter sql.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7923 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-16 04:38:48 +00:00
mark_story
48c65c4092 Adding index() to dbo_postgres. Tests added for index introspection. Also fixes object to string conversions when working with database expressions. Fixes #5867
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7922 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-15 02:25:55 +00:00
TommyO
a601129d46 Brings odbc driver mostly up-to-date. Fixes #5730
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7921 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-14 18:36:40 +00:00
mark_story
43af288eca Adding index(), alterSchema(), dropSchema() support to MySQLi driver. Refactored MySQL & MySQLi drivers. Updated and fixed tests.
Fixes #5824

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7915 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-11 00:13:11 +00:00
mark_story
569b9dd48a Adding index() to dbo_sqlite. Tests added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7913 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-10 03:38:10 +00:00
phishy
caa063590d Fixed #5800. Fixed INSERTs broken by refactoring of DboSource::renderStatement()
Also added slightly more support for CakeSchema with DboOracle


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7912 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-10 01:30:36 +00:00
mark_story
d405d1d1c3 Adding indexes to alterSchema() and CakeSchema::compare(). Thanks for the test case and patch 'bamyers99'. Fixes #5862
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7910 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-09 04:54:58 +00:00
mark_story
930a2d954f Fixing infinite loop in AdoDB when trying to get result sets with more than on result. Fixes #5846
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7908 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-08 03:13:45 +00:00
nate
f06401c563 Correcting regex that parses default values from schema in DboMssql, fixes #5748. Thanks Pixilation for the patch and test case.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7873 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-14 02:00:02 +00:00
nate
1a6a0d1788 Fixing test for DboSource::expression(), moving $startQuote and $endQuote from DboSource to DataSource.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7859 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-10 18:57:50 +00:00
nate
16eebce7f7 Adding support for DboSource::expression(), plus test in Model case. Fixing code formatting in model test and View class -- wrapping lines at 100 characters.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7853 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-09 03:20:14 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
mark_story
b478cde990 Removing 'update' check from firebird driver. Closes #5554
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7837 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-07 02:48:14 +00:00
AD7six
b7587d2d55 fixes #5696 incorrect timestamp definition generated by Posgres schema
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7832 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-06 13:22:57 +00:00
renan.saddam
f4e2b3e24b Handling numeric columns unsigned. Fixes #5695.
Also added some tests to MySQL and MySQLi.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7831 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-06 02:15:12 +00:00
AD7six
2a9b8643db Correcting index detection to not include the fields from a previous index, where several mult-field indexes
exist


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7827 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-05 13:44:05 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
renan.saddam
25ec40600c Reverting previous commit - pg_escape_string($connection, $data) is PHP5-only.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7803 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 11:54:43 +00:00
nate
40bf675589 Refactoring DboSource to remove use of str_split, adding $read (false to calls to) DboSource::value() inside DboSource::create(), cleaning up code formatting, fixes #5598, fixes #5682
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7802 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 05:03:01 +00:00
phpnut
8ede5d21d3 Removing unreachable code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7793 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 06:44:15 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
phishy
091325bcd1 Fixes #5539 - $config prototype was not being set correctly
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7709 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-07 00:55:51 +00:00
nate
ae8a6b958a Disabling query caching in DboMssql::listSources(), fixes #5514
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7701 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-04 22:06:56 +00:00
nate
2bfd5a4b3e Refactoring schema test and fixing formatting, refactoring Model::_findCount() to use DboSource::calculate() in all cases, closes #4501
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7684 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-01 15:27:29 +00:00
nate
8758f36915 Correcting table index formatting for schema generation in DboPostgres, fixes #5471, docblock formatting fixes in ClassRegistry.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7682 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-30 18:59:17 +00:00
gwoo
e6b994bcb1 updating handling of required classes, fixes #5480
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7666 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 14:03:16 +00:00