Commit graph

113 commits

Author SHA1 Message Date
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
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05: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
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
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
SkieDr
627eff5f24 Implementation of table level and field level parameters support 2009-09-29 22:54:48 +04:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02: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
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
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
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
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
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
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
mark_story
ca584c5f1d Removing error suppression from mysql and mysqli drivers. Refs #3877
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7599 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-14 02:28:12 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
mark_story
3c1ebafa0a Modified dbo_mysql update() fixes issue with updateCounterCache on self join tables. updateCounterCache query optimized. Closes #4652, #5152
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7376 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 02:22:15 +00:00
mark_story
4267a4f631 Added patch from 'cavendish' releasing previous result resources in resultSet(). Closes #4801
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7374 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-29 23:29:26 +00:00
mark_story
8d2e4721e3 Added checks for empty string in integer columns. value() Now returns NULL. Closes #5141
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7366 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-27 02:49:02 +00:00
phpnut
1c2b1ef8eb Fixes #5008, DBO Source fails on >= query fixes failing tests added in [7302]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7319 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 12:56:56 +00:00
gwoo
0fc7355e6b another small optimization from last fix
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7281 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 05:34:37 +00:00
gwoo
5e92674990 fixes #4995, call time pass by reference in dbo_mysql
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7275 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-26 23:07:42 +00:00
gwoo
e70f45e1d6 fixes #4987, unable to delete by adding version compare and setting useAlias in DboMysql
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7268 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-26 17:24:16 +00:00
gwoo
2b699435f0 initial commit for dbo hasResult. should lead to further refactoring
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7209 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-18 17:28:17 +00:00
DarkAngelBGE
e221e9fb61 forcing the db layer to make an WHERE field IS NULL when find statements are called with empty arrays, closes #4845
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7155 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-10 16:17:44 +00:00
nate
af16245ab0 Fixing persistent connection handling in Postgres driver, updating fixture with unique index name, removing support for deprecated 'connect' key in database drivers, closes #4773
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7097 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 02:26:40 +00:00
nate
39feb3f7c1 Refactoring DboSource. Model array conditions must now have comparison operators on the left side, fixes misc bugs, updated core to reflect changes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7075 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-31 12:36:38 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
nate
7402680cc1 Misc code formatting and whitespace fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7020 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 05:11:41 +00:00
nate
f2ea3c8bb0 Refactoring DboSource to use Model in order to properly quote values by column type, correcting serial integer schema generation in DboPostgres, fixes #4702, refactoring TreeBehavior to use DboSource::calculate(), fixes #4725, updating docblocks, fixing DboSource test to be database-agnostic, misc. whitespace fixes, updating DboSource test to reflect new quoting rules
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7015 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 19:05:37 +00:00