tPl0ch
|
1eff024e7e
|
Removed unnessecary connect keys from all Dbo's _baseConfig. Updated connect methods where needed. Fixes #132
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-12-27 12:47:52 -05:00 |
|
Mark Story
|
8b93235847
|
Fixing auto merge issues.
|
2009-12-27 12:45:34 -05:00 |
|
Mark Story
|
7a620b62b0
|
Merge branch '1.3-misc' into mergers
Conflicts:
cake/libs/model/datasources/dbo_source.php
cake/libs/view/helpers/js.php
|
2009-12-27 12:45:12 -05:00 |
|
Mark Story
|
6b2154d961
|
Merge branch '1.2' into mergers
Conflicts:
cake/libs/inflector.php
cake/tests/cases/libs/model/model_validation.test.php
|
2009-12-27 12:34:27 -05:00 |
|
Mark Story
|
425dcf2df5
|
Applying patch from 'tPl0ch', connect key is set to 'mysql_connect' when not using persistent connections. Fixes #132
|
2009-12-22 13:23:55 -05:00 |
|
Mark Story
|
4ac0a55aff
|
Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
cake/tests/cases/libs/controller/controller.test.php
|
2009-12-19 19:40:12 -05:00 |
|
Mark Story
|
13ffcbc0ba
|
Updating doc blocks in Datasource. Adding missing reference operators.
|
2009-12-19 13:23:46 -05:00 |
|
Mark Story
|
7387cfdf6b
|
Adding @access tags and expanding doc blocks.
|
2009-12-19 13:06:32 -05:00 |
|
Mark Story
|
7fd9b5ae3b
|
Removing auto dump of sql log.
|
2009-12-19 12:40:32 -05:00 |
|
Mark Story
|
a89fcba243
|
Updating DboSource::getLog() and showLog() to use a View element.
Updating tests to reflect changes in getLog()
|
2009-12-19 12:09:01 -05:00 |
|
Mark Story
|
cbb29dcc5d
|
Extracting sql dump generation into a view element.
Changing the behavior of DboSource::getLog().
Adding sql dump element to layout.
|
2009-12-19 12:09:01 -05:00 |
|
Mark Story
|
959befb6e1
|
Merge commit 'josezap/virtual-fields' into virtual-fields
|
2009-12-18 19:11:50 -05:00 |
|
José Lorenzo Rodríguez
|
8f29f59c1a
|
Enclosing virtual fields in parentheses to avoid SQL errors
Added new tests to improve code coverage on virtual fields
|
2009-12-17 14:42:46 -04:30 |
|
Mark Story
|
b190e462b8
|
Fixing whitespacing.
|
2009-12-17 00:15:42 -05:00 |
|
ADmad
|
33038c75ac
|
Removing redundant 'isset' check from DboMysql::connect
|
2009-12-15 20:41:44 +05:30 |
|
Mark Story
|
02330b2d9c
|
Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
Tests added
Fixes #66
|
2009-12-13 15:52:07 -05:00 |
|
José Lorenzo Rodríguez
|
c65e2f3f18
|
Quoting virtual fields in automatically
Updating test cases
|
2009-12-10 20:46:55 -04:30 |
|
José Lorenzo Rodríguez
|
8c4cad86c2
|
Fixing erroris due to bad rebase
|
2009-12-10 20:35:24 -04:30 |
|
José Lorenzo Rodríguez
|
4b9e03c9f7
|
Creating accesor methods for virtual fields and replacing direct access from DboSource with new methods
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
7a7d0de988
|
Adding support for virtual fields in DboSourse::calculate
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
d06ff5d10a
|
Adding support for virtual fields in conditions array
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
cf359a38b3
|
Re-adding ability to order by virtual fields in DboSource::order
Adding support for paginating virtual model fields in controller
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
051d352eab
|
Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster)
|
2009-12-10 20:08:14 -04:30 |
|
José Lorenzo Rodríguez
|
5a58813031
|
Making DboSource order by virtual fields
|
2009-12-10 20:08:13 -04:30 |
|
José Lorenzo Rodríguez
|
7efafc685e
|
Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
|
2009-12-10 20:08:13 -04:30 |
|
José Lorenzo Rodríguez
|
a81edb6080
|
Extending virtual fields implementation to work on queries with field list
|
2009-12-10 20:07:46 -04:30 |
|
José Lorenzo Rodríguez
|
53765312df
|
Initial implementation of model virtual fields
|
2009-12-10 20:07:07 -04:30 |
|
José Lorenzo Rodríguez
|
285329e7a4
|
Fake commit
|
2009-12-10 20:05:11 -04:30 |
|
José Lorenzo Rodríguez
|
ec672e99e8
|
Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
|
2009-12-10 20:05:10 -04:30 |
|
José Lorenzo Rodríguez
|
00c0bb4d62
|
Extending virtual fields implementation to work on queries with field list
|
2009-12-10 20:01:58 -04:30 |
|
José Lorenzo Rodríguez
|
19c91f1f70
|
Initial implementation of model virtual fields
|
2009-12-10 20:01:58 -04:30 |
|
predominant
|
df151395c5
|
Moving certain datasources to the Datasources Plugin (http://github.com/cakephp/datasources)
|
2009-12-11 01:07:23 +11:00 |
|
renan.saddam
|
c3bf6bc0e8
|
Checking for french error on dbo_mssql. Fixes #77.
|
2009-12-09 21:20:55 -02:00 |
|
renan.saddam
|
931606f7f5
|
Checking for french error on dbo_mssql. Fixes #77.
|
2009-12-09 21:10:37 -02:00 |
|
predominant
|
13ffd76178
|
Removing "Long description for file" from /cake/libs tree.
|
2009-12-08 20:19:02 +11:00 |
|
mark_story
|
24b636cc71
|
Merge branch 'mergers' into 1.2-merger
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
|
2009-12-06 22:03:17 -05:00 |
|
mark_story
|
1f5c6eac2e
|
Fixing issues in tests caused by overwritten columns.
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
|
2009-12-06 21:46:05 -05:00 |
|
mark_story
|
7259a1b920
|
Merge branch '1.2' into 1.2-merger
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
|
2009-12-06 21:43:53 -05:00 |
|
mark_story
|
02f9275e20
|
Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data.
|
2009-11-28 23:02:59 -05:00 |
|
mark_story
|
64dffb7663
|
Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358
|
2009-11-24 22:49:40 -05:00 |
|
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 |
|
mark_story
|
a96c157d94
|
Applying optimizations to use of count() from 'jrbasso'
|
2009-11-21 15:14:21 -05:00 |
|
Juan Basso
|
71df8dbbba
|
Replace function sizeof (alias) by count.
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-11-21 13:50:57 -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 |
|
Juan Basso
|
1acc60b04c
|
Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
|
2009-11-21 13:38:11 -05:00 |
|
renan.saddam
|
4a8808eb21
|
Removing the argument passed to mssql_get_last_message(), it does not accept any argument.
|
2009-11-19 16:35:29 -02:00 |
|
renan.saddam
|
a33bd1d144
|
Removing the argument passed to mssql_get_last_message(), it does not accept any argument.
|
2009-11-19 16:28:11 -02:00 |
|
predominant
|
a91108a81a
|
Adding version check to getCharsetName() for MySQL Datasource.
|
2009-11-16 13:49:52 +11:00 |
|
mark_story
|
acd2c15690
|
Merge branch '1.3-misc' into 1.3-merger
Conflicts:
cake/tests/cases/libs/configure.test.php
|
2009-11-15 20:09:12 -05:00 |
|
mark_story
|
58383d3cb9
|
Merge branch '1.2' into 1.3-merger
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/model.php
|
2009-11-15 20:05:55 -05:00 |
|