Commit graph

64 commits

Author SHA1 Message Date
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
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
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07: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
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02: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
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
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
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
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
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +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
joelmoss
1b1a3d7a5a Reverting last change to DboMysqli, and we now use port config var as the socket if it is a string.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7093 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 19:00:11 +00:00
joelmoss
d14774324a Added support for specifying the socket for MySQLi connections. Fixes #4811
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7092 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 18:18:10 +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
DarkAngelBGE
a625537c4e optimization, refs #3877, fixes #3415
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6969 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 20:31:42 +00:00
gwoo
99874c60d9 fixes #4238, Mysqli working with the test suite.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6849 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 18:03:44 +00:00
nate
c1c35b2e13 Refactoring DboSource - removes all SQL from Model, refactoring transaction handling
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6557 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-11 02:44:33 +00:00
nate
188ff4737d Removing database-generated primary keys from fixture data, fixed primary key handling in schema generation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6354 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-10 07:02:33 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
nate
ac1c7e9da8 Adding stored procedure support to DboMysqli, fixes #2348
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6288 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 18:12:44 +00:00
phpnut
8a2b51c3ec "Removing all shortcut function usage from the core"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6128 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 06:08:03 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
da97a5c871 Correcting @return bool
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
phpnut
f7a4ca1b53 Fixed failing DboSourceTest caused in [5816]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5819 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-20 12:40:19 +00:00
phpnut
e1c26c9948 Fixes #2967, Missing quotes cause SQL errors in some cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5816 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-20 11:45:09 +00:00
gwoo
8bb67d9f6a Adding Schema support, updated fixtures, deprecated loadInfo, changed Dbo::describe in all dbos, fixed tests,
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5563 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-21 21:46:59 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
dho
c58a7e95b9 Fixing typo (ticket #2674)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5226 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-31 06:00:52 +00:00
phpnut
232b109bef Adding enhancement suggestion from #1565 to all Dbo classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5166 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 05:33:55 +00:00
phpnut
48d39f1b45 Merging [5070] into DboMysqli and also adding changes to 1.1.x.x versions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5072 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-13 14:52:17 +00:00
phpnut
2fa0bd866c Adding fix for #2534, refactored mysql and mysqli dbo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5043 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-12 06:35:32 +00:00
phpnut
137fea94c6 Cleaning up line endings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4994 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-03 04:35:25 +00:00
nate
d416fbe4ed Removing name() method from DBO drivers (Ticket #2372)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4830 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-09 19:54:07 +00:00
phpnut
784ee985b5 Adding fix for Ticket #2363
Removed use of:
mysql_insert_id($this->connection);
mysqli_insert_id($this->connection);

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4810 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-07 01:42:12 +00:00
phpnut
ba8421cce2 Adding fix for Ticket #2347
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4785 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-05 17:09:52 +00:00
phpnut
f8023ff0dc Added $config['database'] mysqli_connect() in DboMysqli::connect(), removed mysqli_select_db()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4661 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 10:56:42 +00:00
phpnut
330630c9d0 Adding fix for Ticket #2214
Removed persistent connection setting in DboMysqli::connect() since there is no persistent connection function for mysqli

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4656 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-23 08:57:42 +00:00
phpnut
82d0c2e742 Adding fix from Ticket #2074
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4569 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-04 04:05:57 +00:00