Commit graph

280 commits

Author SHA1 Message Date
Ceeram
cd209ce099 Avoid using LC_ALL, on some installs this would cause error:
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7 Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error:
"setlocale(): Specified locale name is too long"
2012-06-19 18:33:51 +02:00
mark_story
fceb028499 Fix code style errors. 2012-06-03 21:11:34 -04:00
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Jelle Henkens
e5eb7b490e Preventing cache collisions by adding the the datasource key 2012-06-01 10:42:26 +01:00
Jelle Henkens
18b335a605 Replacing crc32 with md5 for less collisions in method caching 2012-06-01 10:42:26 +01:00
Majna
364c293e16 Add test for belongsTo and hasOne optimization. 2012-05-27 23:16:20 +02:00
mark_story
4b8c469004 Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
mark_story
b27a3aab7b Set session.gc_maxlifetime by default.
In the default case of using files for sessions, files could
be garbage collected earlier than expected based on other session
settings.  Always set session.gc_maxlifetime so session files are
garbage collected correctly.

Fixes #2901
2012-05-23 22:25:19 -04:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
Jelle Henkens
97ebbc8e23 Fixing coding conventions 2012-05-19 16:08:40 +01:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
Juan Basso
333ea29805 Renamed variable name from nested transaction 2012-04-26 20:58:25 -04:00
Juan Basso
37537faac0 Renamed method to check if the driver supports nested transaction. 2012-04-26 20:58:25 -04:00
Juan Basso
10a4b87979 Fixed tests with nested transaction in DboSource. 2012-04-24 22:28:47 -04:00
Juan Basso
5f722cb3d4 Update nested transaction test to use InnoDB table in MySQL. 2012-04-24 21:42:32 -04:00
Ceeram
0785ace172 fix error caused by non-existent fixture 2012-04-24 14:01:59 +02:00
Juan Basso
7fe333ce4e Merge branch '2.2-nested-transaction' into 2.2 2012-04-22 23:04:32 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
ca2c122c62 Make flaky tests less flaky.
Off by one second errors are common here.
2012-04-17 20:51:52 -04:00
Juan Basso
37157806b9 Removing some dup code in nested transaction tests. 2012-04-14 16:46:47 -04:00
Juan Basso
7be5349b0c Added configuration to disable nested transaction, even if the db supports it. 2012-04-14 16:43:24 -04:00
Juan Basso
b0a3a1a5aa Added test to check when driver do not support nested support. 2012-04-14 16:25:23 -04:00
Juan Basso
79f7ca7d33 Oops, forgot one change in last commit. 2012-04-14 16:23:51 -04:00
Juan Basso
a512d46679 Sqlite is failing in PHP 5.2, re-adding the check for driver support. 2012-04-14 16:23:51 -04:00
Juan Basso
ffe0a18495 ReflectionMethod::setAccessible() is not compatible with PHP 5.2, causing fatal error in CI. Assuming that the db servers support nested transaction. 2012-04-14 16:23:51 -04:00
Juan Basso
22cd65b7d8 Added tests in each datasource to test the nested transactions. 2012-04-14 16:23:51 -04:00
Juan Basso
30258ac817 Added test for nested methods sequence. 2012-04-14 16:22:36 -04:00
Mark Story
6167529d4d Merge pull request #605 from shama/patch-datasource-test
Add checks for startQuote & endQuote.

Fixes #2769
2012-04-14 08:08:05 -07:00
Kyle Robinson Young
6cf73c763c Tests for a generic custom datasource
Default startQuote and endQuote to avoid error with non-database datasources
2012-04-11 10:08:45 -07:00
Kyle Robinson Young
8bbe250bec Correct method descriptions and remove unused property 2012-04-11 07:50:54 -07:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
Ceeram
c2a8fca00c Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
2012-04-05 23:27:21 +02:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
Ceeram
d2098828c6 Fix fullTablename(), ensure prefix prepending is only skipped when not on position 0 in tablename. Fixes #2750 2012-04-04 15:07:45 +02:00
mark_story
72cb96b727 Fix a few more coding standards errors. 2012-04-02 23:23:53 -04:00
Ceeram
34a730dfd8 ensure buildJoinStatement() does not add schemaname when table value is a subquery, fixes #2709 2012-04-02 18:48:02 +02:00
mark_story
4e67698506 Fix issues with SQLServer + boolean columns.
SQLServer should not have lengths applied to BIT column types.
Remove any length that could have been provided.

Fixes #2439
2012-04-01 22:10:05 -04:00
mark_story
475a1596b7 Merge branch '2.1' into 2.2 2012-04-01 15:37:21 -04:00
ADmad
1763219053 Adding tests for getting session id when using DatabaseSession. Disproves #2734 2012-03-31 00:40:44 +05:30
mark_story
6b045318d8 Merge branch '2.1' into 2.2 2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82 Fix Set::insert() not overwriting values.
Set::insert() failed to overwrite values that were previously
defined as strings.  Remove test in SessionComponentTest that was
ensuring this bug stuck around.

Fixes #2722
2012-03-26 21:50:53 -04:00
Thomas Ploch
68e4e0e7ae Revert "Added TestCakeSession::clear() to CakeSessionTest teardown."
This reverts commit b346ac961c.
2012-03-24 21:43:25 +01:00
Thomas Ploch
b346ac961c Added TestCakeSession::clear() to CakeSessionTest teardown. 2012-03-24 21:41:19 +01:00
Thomas Ploch
fda065101b Fixed test cases for successful being built on travis. 2012-03-24 21:32:31 +01:00
Ceeram
d748fc7451 Merge branch '2.1' into 2.2 2012-03-23 16:32:04 +01:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
c58b61c17b Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
mark_story
dbb2dd44d7 Fix more coding standards. 2012-03-18 21:20:33 -04:00
mark_story
480c1bbb54 Fix coding standards. 2012-03-18 18:06:10 -04:00
mark_story
346e048371 Fix coding standards in Datasource tests. 2012-03-18 13:08:27 -04:00
mark_story
6f8e7f1bc5 Revert "Fix coding standards errors."
This reverts commit 3362100512.
2012-03-18 12:29:39 -04:00
mark_story
3362100512 Fix coding standards errors. 2012-03-18 12:20:24 -04:00
dogmatic69
2ad0f8b8db setting defaults in the DBO so you do not need to pass every field possible to avoid errors. also adds a test for calling with some missing fields. fixes #1779 2012-03-13 17:40:25 +00:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
83a29f054e Fix Session.cookieTimeout default behavior.
When Session.cookieTimeout is undefined, it should
reflect the value set for 'timeout' and not default to 240.

Fixes #2669
2012-03-11 08:14:54 -04:00
Ceeram
2a7bee0a5c make sure locale is restored correct in tests 2012-03-04 00:36:21 +01:00
Renan Gonçalves
3412c0cb0f Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer. 2012-03-02 15:59:59 +01:00
mark_story
2665178ec9 Merge branch '2.0' into 2.1 2012-02-28 07:04:20 -05:00
Norio Suzuki
757579e1d1 Fixed a testcase, support PostgreSQL 9.1
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 06:32:31 -05:00
mark_story
7665f369fa Merge branch '2.1-type-hinting-corrections' into 2.1 2012-02-25 20:07:18 -05:00
mark_story
e958e6c25f Fix strict and warning errors from type hints. 2012-02-25 20:06:48 -05:00
euromark
45112088a1 type hinting models 2012-02-25 19:46:06 -05:00
Kyle Robinson Young
4176e59e52 Typo fixes in tests 2012-02-23 15:29:53 -08:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
Jose Lorenzo Rodriguez
4cfc033387 Fixing failing test cases 2012-02-13 00:26:10 -04:30
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Majna
42cbb8cafe Fix Cache::clear() calls in tests. 2012-02-10 20:38:41 +01:00
mark_story
0cfec525b2 Allow SqlServer to execute procs correctly.
Both SELECT and EXECUTE statements should go through
the parent method as they could fetch results.

Fixes #2558
2012-02-09 22:27:30 -05:00
Yasushi Ichikawa
e8a9d93eb5 Add params option to logQuery()
Parameters for prepared statements are now part of the
logged query data.
2012-02-08 20:15:40 -05:00
Jose Lorenzo Rodriguez
37314a2188 Logging transaction commands in DboSource, fixes #2457 2012-01-21 15:48:17 -04:30
mark_story
0e56d742b8 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
Jose Lorenzo Rodriguez
1991430584 Removing test that does not relate anymore to SqlServer datasource 2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d Fixing a few SqlServer failing tests 2012-01-07 02:14:07 -04:30
mark_story
9562638610 Merge branch '2.0' into 2.1 2012-01-04 07:39:35 -05:00
mark_story
c43b099894 Fix null bytea columns.
Apply patch from 'opiazer'  Fixes #2432
2012-01-03 20:51:56 -05:00
Rachman Chavik
b1aae5b5ab add fullTableName tests with empty schemaName 2011-12-29 19:17:06 +07:00
ADmad
389072708a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
Rachman Chavik
a8d0447e61 fix fullTableName duplicate prefix, closes #2355 2011-12-14 14:35:20 +07:00
mark_story
cfb6ed4cda Fix failing tests. 2011-12-13 22:11:06 -05:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
mark_story
8d1edd72f2 Moving tests and un-skipping them.
Adding tests for proper field quoting in conditions.
Closes #2369
2011-12-13 21:26:03 -05:00
Kyle Robinson Young
b46c4b3e3f Correcting assertEquals parameter order 2011-12-12 20:35:31 -08:00
mark_story
d63d51e3dd Fix failing tests caused by incorrect mocks. 2011-12-11 23:07:01 -05:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Mark Story
a32eabe492 Merge pull request #355 from shama/patch-casing
Consistently setting setUp() and tearDown() on test cases
2011-12-05 11:44:15 -08:00
ADmad
a062135d87 Merge pull request #354 from shama/patch-databasesession-test-fix
Fix DatabaseSessionTest garbage collection test case
2011-12-05 06:00:59 -08:00
Kyle Robinson Young
5388237099 Consistently setting setUp() and tearDown() on test cases 2011-12-04 13:27:51 -08:00
Kyle Robinson Young
66b3e9a7c9 Fix DatabaseSessionTest garbage collection test case 2011-12-04 13:04:42 -08:00
Kyle Robinson Young
8e70f4ac12 Fix CakeSession testCheckKeyWithSpaces and testUsingPluginHandler test cases 2011-12-04 12:43:27 -08:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
49708ec837 Fix cachefiles being generated with "
Cache files with SQLite should not contain "

Fixes #2323
2011-11-30 21:56:25 -05:00
Rachman Chavik
1677e87512 fixing broken tests: update expected regex pattern 2011-11-25 22:36:44 +07:00
Rachman Chavik
1f7c292651 fixing broken tests: updating fullTableName() use
At the same time, reversing arguments since phpunit wants 'expected' as
the first parameter.
2011-11-25 22:36:44 +07:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
mark_story
87f5b6cf26 Fix more strict errors.
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
mark_story
0a0a09920b Updating for PHP5.4
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
Ceeram
d8194a5818 Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0 2011-11-12 18:09:58 +01:00
mark_story
f531e7f24b Fix UUID issue in SQLite
Only varchar(36) was interpreted as a uuid.  char(36)
should also be treated this way.  Most documentation refers
to this type.  Also char(x) fields should be treated as strings,
not text.

Fixes #2184
2011-10-31 23:10:48 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
mark_story
43df8d34e7 Use String::tokenize() to split up fields.
It is slightly more intelligent than explode()
Solves basic problems in Sqlite with virtualFields.

Fixes #2163
2011-10-26 21:17:20 -04:00
ADmad
1244656595 Prevent unneeded afterFind callback triggering on associated models. Fixes #2057 2011-10-26 19:36:32 +05:30
mark_story
fe9e595913 Fix issue with postgres and virtualFields
If a virtualField was set to a literal value it would be quoted.
Test added.

Fixes #2085
2011-10-21 22:17:48 -04:00
Ceeram
2890e6659e Fixing execute() $this->_result was not instance of PDOStatement after queries other then SELECT, lastAffected() now returns correct integer 2011-10-20 14:27:48 +02:00
Renan Gonçalves
d9815dbd65 Fixing file_get_contents() call on the last commit. 2011-10-15 18:55:42 +02:00
Renan Gonçalves
704a9f454d Moving binary data to external file, it was causing failures on other tests. 2011-10-15 18:51:48 +02:00
mark_story
6d9b709c7a Fix method signatures of database drivers.
They were incompatible with Datasource.
Add tests for MySQL and SQLite as their implementation changed a bit.
Update docs for Postgres.

Fixes #2100
2011-10-14 21:25:14 -04:00
kaz29
5eb4c5c6da Fixing bug in getEncoding/setEncoding for PostgreSQL.
Fixes #2028

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-06 22:07:08 -04:00
mark_story
924e283012 Making test less specific as this float cast is different
on different installs.
2011-10-06 21:58:11 -04:00
mark_story
d9e51acf0a Fixing failing tests caused by merge with 1.3 2011-10-06 21:23:35 -04:00
mark_story
055224ef68 Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Mysql.php
2011-10-06 21:06:40 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Jose Lorenzo Rodriguez
5d19b6ded9 Removing test ins porstgres that wasn't actually testing a thing, and making another postgres test pass 2011-10-01 15:25:17 -04:30
Jose Lorenzo Rodriguez
61be5b1d5c Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-01 14:08:56 -04:30
Jose Lorenzo Rodriguez
b8aa000589 Re-implementing Mysql::listDetailedSources() to not use prepared statements, using php <= 5.3.5 + mysqlnd internal driver causes segmentation faults when using a similar query from this method several times. 2011-10-01 14:06:41 -04:30
mark_story
df82aa09e4 Removing test that causes problems in AllTests. 2011-09-30 22:47:47 -04:00
mark_story
af4b0c9c1b Make DboSource::lastError() fallback to the connection.
If there is no argument the connection error should be checked
for an error.
Add a test for most of lastError().  Mocking PDO is a pain.
Fixes #2046
2011-09-30 21:56:39 -04:00
mark_story
a3f25ee5e3 Fixing issue with integer columns and NULL values.
Fixes #2037
2011-09-29 20:28:52 -04:00
Jose Lorenzo Rodriguez
fbdb058441 Converting regular expression assertions to simple string contains, those perform faster and consume less memory 2011-09-29 00:05:15 -04:30
mark_story
7e44836837 Fixing failing test. 2011-09-26 21:46:25 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
2011-09-18 12:09:04 -04:00
Jelle Henkens
7ba2f90b2a Refactoring expectError() calls to PHPUnit annotations 2011-09-13 19:56:37 +01:00
mark_story
d74f442608 Making test case class names match file names.
Refs #1985
2011-09-12 23:01:04 -04:00
Jose Lorenzo Rodriguez
149deba416 Fixing Mysql test case after making the DboSource throw exceptions 2011-09-03 19:12:06 -04:30
Jose Lorenzo Rodriguez
74ba030e7c More postgres tests passing again 2011-09-03 18:34:11 -04:30
Jose Lorenzo Rodriguez
61ff8d6154 Making DboSource tests more portable 2011-09-03 18:07:26 -04:30
Jose Lorenzo Rodriguez
fcf58371fd Fixing a failing postgres test 2011-09-03 17:09:41 -04:30
Jose Lorenzo Rodriguez
0ca8af2c22 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-09-03 17:01:49 -04:30
Jose Lorenzo Rodriguez
f0ef0aab62 Making postgres tests pass 2011-09-03 17:00:16 -04:30
mark_story
2c21fc90fb Fixing failing tests and issues with Sqlite. 2011-09-03 22:07:45 +01:00
Jose Lorenzo Rodriguez
36470f4a86 Removing $error property from DboSource, errors in queries will throw exceptions now 2011-09-03 12:17:00 -04:30
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
Juan Basso
e9390985ca Changed mergeAssociation scrubQueryData to be protected. 2011-08-21 21:27:35 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
b603232aee Removing redundant call to DboSource::fields(), the fields come already quoted from DboSource::read() 2011-07-17 17:42:47 -04:30
Majna
cde13daed4 Refactored DatabaseSession to use only 'Session.handler.model' config. Fixed static call on non-static method DatabaseSession::gc(). Fix for SessionFixture -primary key too long (MySQL Error: 1071) 2011-07-11 00:16:41 +02:00
Mark Story
08f1afe328 Updating varchar, text columns to use nvarchar.
This storage type stores unicode properly, and is the
saner default datatype for most applications.
Fixes #1321
2011-06-23 23:01:17 -07:00
Mark Story
6bcfd19ea7 Fixing tests that shouldn't have been changed. 2011-06-23 16:27:59 -07:00
Mark Story
9ab2ec7d49 Adding support for Unicode characters. Refs #1321 2011-06-23 15:46:03 -07:00
Mark Story
91a1cf81f3 Merge branch '1.3' into merger
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.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/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	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/view.php
	cake/libs/xml.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/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.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/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.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_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.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/i18n.group.php
	cake/tests/groups/javascript.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_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.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/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.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/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/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/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00