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
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
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
SkieDr
627eff5f24
Implementation of table level and field level parameters support
2009-09-29 22:54:48 +04:00
SkieDr
a445a12020
Implement tests for new dbo source methods for additional table and field parameters support
2009-09-29 22:54:36 +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
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
mark_story
11ceae2e96
Merge branch '1.3' into 1.3-logging
2009-09-07 22:41:31 -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
AD7six
e47316e74f
Correcting App::import usage
2009-09-04 11:58:20 -07: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
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
jperras
74e6b30d7b
Removing duplicate classes & methods from a lost merge.
2009-08-02 22:59:15 -04:00
gwoo
d905c274c8
Merge branch '1.2' into 1.3
2009-08-02 16:18:25 -07:00
gwoo
07d1ecdf6d
adding change to DboSource test that was not committed in [8267]
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8275 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 23:21:24 +00:00
gwoo
7fc465309e
Merge branch '1.2' into 1.3
2009-08-02 11:58:39 -07:00
gwoo
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07: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
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
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
gwoo
a9d98e73c3
Merge branch '1.2' into 1.3
2009-07-22 09:27:31 -07: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
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -07: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
gwoo
6f21c18366
Merge branch '1.3-lib_renames' into 1.3
2009-06-02 10:17:02 -07: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
renan.saddam
f25cf63206
Adding missing test from last commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8162 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-29 16:39:42 +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
renan.saddam
48386b791f
Fixing cake_test_fixture and dbo_mssql tests. Refs #6135 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8159 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 22:20:04 +00:00
davidpersson
fd7d6718a1
Updating tests to not affect other ones when run from a group
...
Adding NoCrossContamination group
Shortening group class names
Renaming lib_controller group
Updating test imports to include the core AppController by default
Some cosmetics
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8123 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-21 23:55:39 +00:00
davidpersson
3c3b852099
Changing package of tests from "cake.tests" to "cake".
...
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
renan.saddam
76e0f17dbc
Updating documentation to improve code completion
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8114 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-17 21:10:28 +00:00
jperras
70e0316cd2
Renaming schema.php to cake_schema.php. Modifying relevant App::import calls.
2009-03-15 22:22:18 -04: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
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
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
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
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
mark_story
d7f70ea5b9
Fixing broken tests.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7919 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-13 00:20:11 +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