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
jperras
24351b5a21
Backporting bugfix for #22 from 1.3-console to 1.2. Adds schema shell test cases, fixes for schema object references, i18n of schema schell output strings.
2009-09-07 12:24:38 -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
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
1bedd8418b
Merge branch '1.3-deprecation' into 1.3-misc
2009-08-31 23:41:41 -04:00
mark_story
046d7c75d0
Adding warnings to newly deprecated methods.
2009-08-31 22:31:36 -04:00
mark_story
bd350e95b6
Deprecating Model::bind()
2009-08-31 22:18:31 -04:00
mark_story
3cdf89dc18
Removing unused $db in Model::_deleteLinks. Fixes #6384
2009-08-30 20:09:07 -04:00
mark_story
c19c1a7828
Fixing issues with cakeError call.
...
Adding tests for cakeError being called with non-existant Behaviors.
2009-08-30 19:33:21 -04:00
mark_story
7ca1ef22f0
Adding cakeError calls to ModelBehavior.
2009-08-27 00:16:17 -04:00
jperras
e9cfb66424
Fixing calling of method from incorrect object in DboOracle::describe(). Fixes #21 .
2009-08-23 17:52:40 -04:00
mark_story
ae715ef882
Adding in fallback for sql & schema dirs.
...
Starting to add plugin support for schema shell.
tests added.
2009-08-20 01:07:21 -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
mark_story
f9e0ddfac6
Removing _with use.
2009-08-18 11:53:52 -04:00
mark_story
a7499be154
Adding missing & operators.
...
Adding tests for run update.
Adding -f param to schema run update to allow for testing and forcing of table comparison. Skips model checks and uses tables only instead.
2009-08-14 20:06:27 -04:00
gwoo
c33437af76
updating require of overloadbale in model
2009-08-03 11:44:06 -07:00
AD7six
a4bc755cc7
whitespace normalization
2009-08-02 16:10:24 -07:00
gwoo
15ed658a27
Revert "Merge branch '1.3-newlines' into 1.3"
...
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
AD7six
d61e8736e4
Merge branch '1.3' into 1.3-bake
2009-08-02 22:44:28 +02:00
AD7six
7eb150b49a
Merge branch '1.3' into 1.3-bake
...
Conflicts:
cake/console/libs/tasks/model.php
2009-08-02 22:31:01 +02:00
gwoo
c017f80e02
Merge branch '1.2' into 1.3
2009-08-02 13:25:55 -07:00
gwoo
292b37c6e8
Merge branch '1.3-console' into 1.3
2009-08-02 12:31:12 -07:00
gwoo
bf2b8a60e6
Merge branch '1.3-misc' into 1.3
2009-08-02 12:20:07 -07:00
jperras
3f46bf9568
Updating doc block for Model::invalidate. Fixes #4583 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8274 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 19:18:54 +00:00
gwoo
d118c6a764
Merge branch '1.3-newlines' into 1.3
2009-08-02 12:08:55 -07:00
gwoo
7fc465309e
Merge branch '1.2' into 1.3
2009-08-02 11:58:39 -07:00
jperras
e9e8951a27
Updating doc blocks for datasource - thanks to savant for patch. Fixes #5738 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8270 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 18:52:55 +00:00
gwoo
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07:00
mark_story
3aa6d22c2c
Correcting path that CakeSchema looks for schema files in.
2009-08-01 17:50:03 -04:00
jperras
5172035e02
Adding table prefix detection for sequence maps in DboOracle::describe(). Fixes #6527 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8268 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 19:40:52 +00:00
gwoo
887f8335ee
fixes #6539 quoting in buildIndex
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8267 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 18:25:25 +00: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
gwoo
1423b0067b
Merge branch '1.2' into 1.3
2009-07-30 11:34:33 -07: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
DarkAngelBGE
f710ae7fbe
Minor refactorings + fix for dbo mysqli related to previous commit
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8261 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:08:24 +00:00
DarkAngelBGE
f88cc56cfe
Coding standards fixes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8260 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:01:42 +00:00
AD7six
3b1664b7dd
Preventing loading the ConnectionManager from triggering reloading the Model file
2009-07-28 08:36:55 +02:00
AD7six
fd0aaefb39
whitespace normalization
2009-07-26 12:46:07 +02:00
gwoo
062f471b7f
updating App::import usage. ran each test and everything seems ok.
2009-07-25 18:27:02 -07:00
gwoo
766e12bc2a
Merge branch '1.3' into 1.3-newlines
2009-07-25 10:41:40 -07:00
gwoo
986af28de0
Merge branch '1.2' into 1.3
2009-07-24 15:57:30 -07:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
jperras
e40428801e
Removing all uses of uses() global method & replacing with require or App::import.
2009-07-24 13:41:08 -04:00
gwoo
30281d6c59
fixes #6506 , notice on 5.2.10 for habtm save with empty value
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8251 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 19:28:46 +00:00
mark_story
93d64c4e76
Removing use of e() from core classes. Refs #6525
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8250 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-23 13:35:14 +00: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
DarkAngelBGE
fefbe77208
Minor refactorings for DboMysql, DboSource and TextHelper
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +00:00
gwoo
a2f0ab8b27
Merge branch '1.2' into 1.3
2009-07-20 09:31:56 -07:00
mark_story
fb6b16c467
Fixing empty time value handling in Model::deconstruct(). Both null and 00:00:00 are valid values now. Test cases added and refactored. Fixes #6488 , #6018 , Refs #5659
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8225 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-08 03:25:30 +00:00
gwoo
f1a4352620
Merge branch '1.2' into 1.3
2009-07-03 08:24:42 -07:00
gwoo
f2b7a26be8
fixes #5710 , HABTM - constraining unique ids, but removing non-unique
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8217 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 03:31:05 +00:00
mark_story
45a51ed809
Changing return of Model::deleteAll(). When no records are matched by the delete conditions return is now (bool)true as no records matching those conditions exist.
...
Test case added.
Fixes #6453
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8216 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 00:26:58 +00:00
gwoo
92b8e87ed7
fix for cross database joins when recursive < 1
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8212 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:14:38 +00:00
gwoo
2ba8e8777c
Merge branch '1.2' into 1.3
2009-07-02 16:12:50 -07:00
gwoo
3c76f173f7
removing deprecated model methods
2009-07-02 10:24:42 -07:00
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -07:00
mark_story
6a34c9ef31
Fixing Model::saveAll() PHP4 compatibility. Minor API change in __save(). __save() no longer takes a model instance as the first parameter. Because of Model implementation details in PHP4 this caused broken references. Fixes #6389 , #6223
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8204 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-27 15:25:07 +00:00
gwoo
88e0cfa2f8
fixes #6427 , default datasource not loaded when ds is specified
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8197 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-16 21:35:21 +00:00
gwoo
c3643767bf
some more updates to path handling
2009-06-10 16:13:39 -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
gwoo
fdd63d4e8e
Merge branch 'master' into 1.3
2009-06-02 10:12:14 -07:00
jperras
d2b4995e43
Updating Model::deconstruct to handle db expressions correctly. Fixes #6372 ; thanks to mattcurry for the patch.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8185 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-02 03:23:15 +00: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
mark_story
f498ba0a87
Adding german error string to dbo_mssql::lastError() Fixes #6352
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8180 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-29 02:59:30 +00:00
mark_story
f0752feeec
Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
...
Test cases and fixtures added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
mark_story
41f32d8cee
Updating doc block for Model::beforeDelete(). Fixes #6219
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8174 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-22 01:20:47 +00:00
gwoo
d2667c0e6f
merging master into 1.3
2009-05-04 16:06:08 -07:00
gwoo
6535e6225c
merging 1.2
2009-05-04 15:57:10 -07:00
nate
8369a8f2d8
Sanitizing path in Dispatcher::baseUrl(), fixes #6336 , misc. whitespace fixes.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8165 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 20:36:22 +00:00
gwoo
15518b8c9a
merging 1.3-misc into master
2009-05-01 14:05:46 -07: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
jperras
8bb11e49d7
Fixing counterCache behavior when updating an existing record's counterScope value. Thanks for the patch, mattcurry. Fixes #6270 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8155 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:17:21 +00:00
gwoo
9ab6339392
fixes #6240 , DboOracle: fix cache sources and php version compatibility
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8154 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 01:06:46 +00:00
gwoo
fd0c39fcc6
fixes #6293 , Deleting non-existing record causes save() to fail. Thanks to msadouni for the patch and test!
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8150 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-22 16:47:34 +00:00
gwoo
0cc3d5149f
fixes #6277 , relaxing character length comparison for UUID
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8149 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-22 16:05:13 +00:00
jperras
066629d566
Removing hard-coded 'id' field from Model::_prepareUpdateFields. Fixes #6274 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8139 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-13 14:15: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
gwoo
de5907326e
fixes #6203 , Model::invalidFields respecting Model::whitelist
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8113 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-17 18:19:12 +00:00
jperras
70e0316cd2
Renaming schema.php to cake_schema.php. Modifying relevant App::import calls.
2009-03-15 22:22:18 -04:00
jperras
e651c77bcf
Renaming behavior.php to model_behavior.php. Modifying associated App::import calls.
2009-03-15 21:17:08 -04:00
jperras
beb6aeec0c
Fixing incorrect doc blocks for connection_manager.php. Thanks to ADmad for noticing the inconsistency.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8106 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-15 23:01:21 +00:00
nate
80d4dfa306
Cleaning up previous commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8088 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 00:22:28 +00:00
nate
4466c9f7b7
Reverting changes to Behavior so that all models use the same behavior instance, fixes #6038 , refs #4408 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8087 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 00:06:41 +00: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
1497fddf80
Applying patch from 'rafaelbandeira3' fixing formatting of generated code to better follow cake coding standards. Fixes #5754
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8082 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 18:05:18 +00:00
mark_story
965b8e9641
Updating doc blocks on tree behavior.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8081 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 17:12:30 +00:00
mark_story
62ea98bdb2
Fixing minor typo in model.php. Closes #6176
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8080 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 16:20:11 +00:00
mark_story
ffc537aaa8
Minor optimization. Removing additional variable assignment.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8077 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 03:54:52 +00:00
gwoo
7dc627dd19
refs #4119 , another check for binary uuid
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8074 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-04 01:36:53 +00:00
gwoo
088815834e
fixes #4119 , refs #6151 binary uuid
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8070 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 16:33:17 +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
renan.saddam
52f4cd42db
Fixing issue when Model::$translateTable is set
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8050 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-19 13:45:51 +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
b1b67c811c
Applying patch from 'ralph.marchildon' Fixes saving habtm data using 'with' data. Fixes #6077
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8021 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-11 03:53:04 +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