Mark Story
896414e632
Fixing parse error in PHP4 caused by optional arguments with default
...
values being passed by reference. Fixes #180
2010-01-11 09:40:56 -05:00
Joël Perras
730153b151
Adding isset() checks for CakeSchema::compare() when diff'ing db indexes.
...
Allows for slightly better interoperability between schemas generated with CakePHP 1.2 and with 1.3
2010-01-07 17:49:57 -05:00
predominant
804fba1a22
Adding block comments for Postgres Datasource quotes.
2010-01-05 23:23:23 +11:00
Mark Story
7dcf66dd95
Removing dynamic calling of setTablePrefix(). tableprefix should be with the tablePrefix property, and any other custom construction behavior should be done in an overridden Model::__construct.
2010-01-02 00:07:31 -05:00
Mark Story
eab706e772
Correcting and improving doc block for Model::__construct.
2010-01-01 23:59:36 -05:00
Mark Story
026eeb645b
Correcting and improving doc block for Model::__construct.
2010-01-01 23:58:07 -05:00
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
34410de7c8
Adding property definition for Model::$virtualFields
2009-12-20 16:26:12 -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
Mark Story
4ac29963a8
Refactoring Model::__validateWithModels. Should be slightly faster as loops are smaller.
2009-12-15 22:55:34 -05:00
Mark Story
a490e249fa
Adding test for validation of with models canceling a save.
...
Adding initial implementation of Model::__validateWithModel().
Correcting error in previous commit. Adding tests for saveAll and validating habtm with models.
2009-12-15 22:55:22 -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
22e36cb057
Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array
2009-12-10 20:08:12 -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
2503632327
Working on virtual fields on order clause.
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
0ab2078284
Changing Model::hasField() api to accept second parameter for checking existance of virtual field
2009-12-10 20:05:10 -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
4685daf299
Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
f7a113d2b0
Convertig old-style find call to new api
2009-12-10 20:01:58 -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
be64f26f9f
Updating doc blocks for model::validates.
2009-12-03 00:53:31 -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
ADmad
ad20e43730
Removing unneeded code for minor optimization
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -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
6fdaa82969
Merge branch '1.3' into 1.3-merger
2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd
Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set.
2009-11-22 21:26:25 -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
2e0acbf505
Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304
2009-11-22 17:56:46 -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
mark_story
0783176238
Replacing duplicated code with pluginSplit().
...
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
63ab96d751
Setting $primary = false inside DboSource::queryAssociation. Fixed #208
2009-11-15 17:48:41 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
mark_story
2c5fa171e0
Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
...
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b
Changes Model::find() to allow modification of DataSource connection during callbacks.
2009-11-12 14:48:03 -05:00
mark_story
6b5c247162
Merge commit 'origin/1.2' into mergers
...
Conflicts:
cake/bootstrap.php
cake/console/cake.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/paginator.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
6db91b0f49
Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253
2009-11-07 17:43:18 -05:00
predominant
62810fb4f4
Updating more Copyright dates.
2009-11-06 18:04:38 +11:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
e609875754
Updating Model::invalidFields, so returning false from beforeValidate() will abort both the validation and saving() of the record.
...
Tests added to check beforeSave, beforeValidate, and beforeDelete return values.
Fixes #257
2009-11-04 12:36:17 -05:00
mark_story
dc07a05fca
Merge branch '1.3' into 1.3-misc
2009-11-04 09:20:21 -05:00
tPl0ch
f5ca3ace1f
Modified Model::find() to make Model::findQueryType available in Model callbacks. Fixes https://trac.cakephp.org/ticket/5847 . Tests added
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-04 09:16:04 -05:00
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
5f1e6ba6a0
Making DboSource::fetchAll return $this->_result if it is a boolean and $out is empty. Allows for Model::query() to return boolean values for operations that do not return recordsets. Fixes #6404
2009-10-29 20:31:29 -04:00
mark_story
23831546b5
Adding valid options for sqlite collation. Tests added.
2009-10-29 02:03:50 -04:00
mark_story
a33457155f
Adding valid option checking to fieldParameters.
...
Test case added.
2009-10-29 02:03:21 -04:00
mark_story
f299283dc4
Refactoring duplicated code into a method.
2009-10-29 01:47:25 -04:00
mark_story
2a8858e928
Adding tests to DboSqlite::buildColumn
...
Adding collate field parameter to DboSqlite.
Removing duplicated code from DboSource, adding parent call instead.
2009-10-29 01:36:15 -04:00
mark_story
5a093e5627
Fixing issues in postgres with time columns and '' values.
...
Tests added.
Fixes #213
2009-10-27 13:22:34 -04: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
0e23fdfbb3
Fixing infinitely nesting stack frames when TreeBehavior::reorder() is called and the models $cacheQueries = true and there are a sizable number of records being manipulated.
...
Test cases added.
Fixes #188
2009-10-21 00:22:36 -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
mark_story
0a79822b9d
Expanding some doc blocks for DataSource.
2009-10-19 21:09:47 -04:00
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
e04cc81613
Updating doc block.
...
Removing redundant condition.
2009-10-12 23:38:55 -04:00
mark_story
f59e4013c7
Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2
2009-10-06 09:22:47 -04:00
mark_story
6e9ca4367e
Fixing connection methods in DboSybase. Fixes #145
2009-10-06 09:21:43 -04:00
mark_story
2d2e692b37
Updating doc blocks to improve API parsing.
2009-10-05 21:27:34 -04:00
mark_story
a99d2ea821
Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2
...
Conflicts:
cake/libs/model/model.php
2009-10-05 21:02:41 -04:00
mark_story
51e471427a
Updating doc blocks to improve parsing in the API.
2009-10-05 21:01:31 -04:00
mark_story
3bf94e6a28
Updating documentation for Model methods to improve api parsing.
...
Removing redundant include.
2009-10-05 20:42:37 -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
7b0bc014cc
Updating whitespacing.
2009-10-04 20:54:27 -04:00
mark_story
778755c2b0
Implementing CakeSchema:;_compareTableParameters. Adding tests for tableParameter comparison.
2009-10-04 20:53:49 -04:00
mark_story
aae120a81a
Updating file headers.
2009-10-04 13:35:11 -04:00
mark_story
05f6099def
Enabling plugin.name schema file creation and addition.
...
Making CakeSchema::load() use plugin parameter, tests added.
Plugin schema file added to test_app.
2009-10-04 13:32:33 -04:00
mark_story
0b6d6cee6c
Adding placeholder method to DboMysql to handle alteration of table parameter statement generation.
2009-10-03 16:49:01 -04:00
mark_story
2fe877e527
Adding method to compare tableParameters in the Schema, so they no longer fall through as fields.
2009-10-03 16:48:10 -04:00
mark_story
0fc6f58cfb
Refactoring and merging duplicated code between CakeSchema and FixtureTask
2009-10-03 16:15:56 -04:00
mark_story
236a679b17
Updating tests for schema. Making tests more reliable for schema read.
2009-10-03 16:08:54 -04:00
mark_story
e733c569be
Fixing broken tests.
2009-10-03 12:44:49 -04:00
mark_story
0029a275bd
Refactoring code into a separate method. Will allow code reuse in fixture generation. Tests added.
2009-10-03 12:41:14 -04:00
mark_story
71aa460a48
Continuing work on getting plugin support for CakeSchema and SchemaShell. Applied patch from 'SkieDr', test cases added.
2009-10-03 11:48:02 -04:00
mark_story
32d5b40cd0
Adding error triggering while in debug mode for unhandled validation methods.
2009-09-30 22:34:29 -04:00
mark_story
7d4510b959
Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2
2009-09-30 14:26:38 -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
mark_story
dc220bbb21
Fixing DboSybase::connect() to use port configuration value. Thanks 'tPl0ch' for the various attempts :) Fixes #90
2009-09-29 20:43:17 -04:00
SkieDr
627eff5f24
Implementation of table level and field level parameters support
2009-09-29 22:54:48 +04:00
mark_story
778a6b9303
Reversing change from [a37fc0d455e373b30a73f11687885572c6e4b90d]. As the additional & causes errors in PHP <= 5.2
2009-09-29 10:05:03 -04:00
mark_story
51508c6375
Fixing error in php5.3 when calling behavior methods that had more than 6 parameters.
2009-09-28 18:09:02 -04:00
jperras
f3d0769912
Renaming ConnectionManager::__getDriver() to ConnectionManager::__connectionData().
2009-09-25 11:08:41 -04:00
jperras
c2ec96067a
Refactoring ConnectionManager & tests.
2009-09-25 11:08:34 -04:00
jperras
7e5fe04a77
Merge branch '1.3-misc' into 1.3-misc-plugin-datasources
2009-09-24 23:14:12 -04:00
jperras
c3cd98af42
Implementing loading datasources from plugins.
2009-09-24 22:56:02 -04:00
jperras
11365e7a09
Fixing return by reference error on the use of ConnectionManager::getDataSource() on a non-existing datasource.
2009-09-24 19:29:35 -04:00
jperras
0949ea912d
Merge branch '1.2' of code.cakephp.org:cakephp into 1.2
2009-09-24 16:41:54 -04:00
jperras
4bf5244073
Adding tests for ConnectionManager, and fixing a missing return value for ConnectionManager::loadDataSource().
2009-09-24 16:26:56 -04:00
jperras
ffad7a74a2
Merge branch '1.3-misc-plugin-datasources' into 1.3-misc
2009-09-24 16:26:17 -04:00
jperras
ed74653d72
Adding tests for ConnectionManager, and fixing a missing return value for ConnectionManager::loadDataSource().
2009-09-24 16:23:39 -04:00
mark_story
34deb2a18d
Correcting omission of group in DboOracle. Fixes #98
2009-09-23 23:16:57 -04:00
mark_story
42017e95c6
Merge branch '1.3-console' into 1.3
...
Conflicts:
cake/tests/cases/console/libs/schema.test.php
2009-09-20 19:05:03 -04:00
mark_story
d5376e64aa
Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261
2009-09-19 01:17:20 -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
793c6ec07a
Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91
2009-09-15 22:00:49 -04:00
mark_story
2c633912e0
Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91
2009-09-15 22:00:04 -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
nate
fd6538fc72
Changes Model::find() to allow modification of DataSource connection during callbacks.
2009-09-10 09:28:55 -04:00
jperras
5a432c6f71
Applying fix from Ceeram for updateAll joins on model relations with no foreign key. Fixes #69 .
2009-09-09 00:00:53 -04:00
jperras
daadac03cc
Merge branch 'bug-22-schema-shell' into 1.2
2009-09-07 12:34:12 -04:00