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
|
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
|
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
|
6b7c752478
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-09-28 21:23:43 -04:30 |
|
Jose Lorenzo Rodriguez
|
df2ef0e4f1
|
Bringing the SQlserver datasource up to date, fixing a doc block
|
2011-09-28 21:23:06 -04:30 |
|
mark_story
|
6008e0e8a0
|
Adding quoting around SET NAMES.
Fixes #2028
|
2011-09-26 21:46:16 -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 |
|
ADmad
|
7c87e9abc1
|
For MySQL you can now specify the socket to use using unix_socket key in the config array. Closes #1994
|
2011-09-16 13:40:04 +05:30 |
|
Jose Lorenzo Rodriguez
|
3d0af8b690
|
Adding a new exception renderer method to show useful error for failed queries
|
2011-09-04 04:50:19 -04:30 |
|
mark_story
|
2c21fc90fb
|
Fixing failing tests and issues with Sqlite.
|
2011-09-03 22:07:45 +01:00 |
|
Jose Lorenzo Rodriguez
|
d24c408537
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-09-03 14:31:02 -04:30 |
|
mark_story
|
4172eac7c6
|
Removing trigger_warning() that causes tests to fail in Sqlite, as
it does not assign lengths for integer columns.
|
2011-09-03 18:59:23 +01:00 |
|
Jose Lorenzo Rodriguez
|
49b8b24ac2
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-09-03 13:09:04 -04:30 |
|
mark_story
|
2ceea79862
|
Fixing errors and failing tests with SQLite.
Seems that MySQL is extremely permissive with NOT NULL fields.
SQLite is more strict it seems.
|
2011-09-03 18:37:29 +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 |
|
mark_story
|
cc8d44f21f
|
Adding an exception for when a PDO interface is not installed.
|
2011-09-03 17:03:31 +01:00 |
|
Jose Lorenzo Rodriguez
|
783b5d4d1c
|
Fixing fatal errors when running postgres
|
2011-09-03 11:27:58 -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 |
|
Mark Story mark@mark-story.com
|
8ce6c31708
|
Adding extra information about DboSource::fetchAll() and result caching.
|
2011-08-31 22:52:33 +01:00 |
|
Juan Basso
|
e9390985ca
|
Changed mergeAssociation scrubQueryData to be protected.
|
2011-08-21 21:27:35 -04:00 |
|
Juan Basso
|
61833294f0
|
Changed the visibility to methods that not affect others classes.
|
2011-08-20 01:39:30 -04:00 |
|
Juan Basso
|
f5a54d00dd
|
Changed methods and attributes from private to protected.
|
2011-08-20 00:43:34 -04:00 |
|
Juan Basso
|
0575e92833
|
Added visibility in some methods and attributes.
|
2011-08-18 22:30:28 -04:00 |
|
Juan Basso
|
16ef234180
|
Removing trailing spaces.
|
2011-08-15 23:55:08 -04:00 |
|
Juan Basso
|
620a65b2fc
|
Merge branch '2.0' into 2.0-api-doc
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
|
2011-08-14 21:12:05 -04:00 |
|
mark_story
|
d93c8cb200
|
Merge branch '1.3' into merger
Conflicts:
cake/libs/controller/components/security.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
lib/Cake/Test/Case/Utility/SetTest.php
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/CacheHelper.php
|
2011-08-14 14:39:49 -04:00 |
|
Juan Basso
|
895c10af7b
|
Adjusted some types in @param, @return and @var.
|
2011-07-31 22:57:17 -04:00 |
|
Juan Basso
|
4df585e15e
|
Changed method API description.
|
2011-07-31 20:33:09 -04:00 |
|
Juan Basso
|
ebb70c4810
|
Fixed type to parameters that is defined in the code.
|
2011-07-31 18:03:28 -04:00 |
|
Juan Basso
|
2a50a1ea99
|
Included @var in API that was missing.
|
2011-07-31 17:05:20 -04:00 |
|
Juan Basso
|
fedadc091c
|
Included @throws in API that was missing.
|
2011-07-31 16:55:52 -04:00 |
|
Juan Basso
|
9bc3e567c1
|
Removed the @access and @static.
|
2011-07-30 20:56:48 -04:00 |
|
Juan Basso
|
e4a1816557
|
Changed the signature of methods to avoid strict messages.
|
2011-07-30 19:17:20 -04:00 |
|
Juan Basso
|
39b4032820
|
Fixed some API doc in model.
|
2011-07-30 18:38:57 -04:00 |
|
Jose Lorenzo Rodriguez
|
cfd2d9e00b
|
Updating all @package annotations in doc blocks
|
2011-07-26 01:46:14 -04:30 |
|
Jose Lorenzo Rodriguez
|
50d4330487
|
Ensuring uniqueness of method cache keys, all tests passing now
|
2011-07-17 23:45:22 -04:30 |
|
Jose Lorenzo Rodriguez
|
03dac31930
|
Using the static property instead
|
2011-07-17 22:41:12 -04:30 |
|
Jose Lorenzo Rodriguez
|
a786f4b1c6
|
Making DboSource::$methodCache a static variable to be able to share the cache between multiple instances of the same class
|
2011-07-17 22:26:21 -04:30 |
|
Jose Lorenzo Rodriguez
|
58282c3934
|
Micro optimization on Mysql source
|
2011-07-17 19:23:15 -04:30 |
|
Jose Lorenzo Rodriguez
|
762ebd4b93
|
Implementing a persitent method cache for DboSource, using a stronger hashing algorithm to ensure unique keys
|
2011-07-17 19:08:23 -04:30 |
|
Jose Lorenzo Rodriguez
|
ca0a7e4271
|
Removing method cache from DboSource::conditions() this was consuming too much memory and bringing little to no performance increase
|
2011-07-17 17:44:12 -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 |
|
Ceeram
|
6047024546
|
removing unneeded parameter
|
2011-07-12 17:00:25 +02:00 |
|
José Lorenzo Rodríguez
|
273125d2f5
|
Merge pull request #146 from majna/2.0-database-session
Refactored DatabaseSession to use only 'Session.handler.model' config
|
2011-07-11 16:28:25 -07:00 |
|
Ceeram
|
4d702ee97f
|
removing unused parameter for value()
|
2011-07-11 22:13:03 +02:00 |
|
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 |
|
Jose Lorenzo Rodriguez
|
ee2930d3d0
|
Removing magic variable in DboSource to bypass the adding of fields to association queries, instead adding the ability to declare 'fields' => false in the association array. This opens the possibility of having joins for filtering purposes.
|
2011-06-28 11:45:37 -04:30 |
|