Commit graph

512 commits

Author SHA1 Message Date
mark_story
b9f0fc0724 Merge branch '1.3' into merger
Conflicts:
	cake/dispatcher.php
	cake/libs/cake_session.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/set.php
	cake/libs/validation.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
José Lorenzo Rodríguez
c559b9c22d Merge remote branch 'origin/2.0' into 2.0
Conflicts:
	cake/console/templates/skel/config/database.php.default
	cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
mark_story
8031d33d33 Fixing more E_STRICT notices and adding a type check to DboSource::dropSchema(). 2010-12-04 14:37:02 -05:00
mark_story
18fb12c95c Removing & pass by ref operators as they aren't needed any more.
Fixing a bunch of E_STRICT errors.
2010-12-04 14:15:32 -05:00
mark_story
d13759522b Removing strtolower() calls. You must now call model magic findBy and findAllBy using camelcase forms. 2010-12-04 13:45:42 -05:00
mark_story
466137485d Removing a duplicated property.
Changing is_a() to instanceof as it marginally faster.
Adding a comment to getConnection as it was missing it.
Minor optimization to a regular expression.
2010-12-04 13:28:43 -05:00
José Lorenzo Rodríguez
e167271568 Making more DboSlite tests pass 2010-12-03 14:41:39 -04:30
José Lorenzo Rodríguez
7c4ab886e6 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-12-03 14:08:03 -04:30
José Lorenzo Rodríguez
2e04c5260e Fixing some tests to make them run on sqlite 2010-12-02 00:19:43 -04:30
José Lorenzo Rodríguez
a791687784 Adding try catch for pdo exception on DboSource::_execute 2010-11-28 23:50:18 -04:30
José Lorenzo Rodríguez
372123f15a Moving common method put from DboMysl into DboSource, this makes more sqlite tests pass 2010-11-28 22:45:56 -04:30
José Lorenzo Rodríguez
41ee035d28 Starting to bring sqlite dbo up to date 2010-11-26 23:46:34 -04:30
mark_story
845edf38e1 Removing core classes using App::import() with an array(). This usage incurs an additional call to App::import().
Removing Set from core class imports, as Set is required as part of the framework bootstrapping.
2010-11-25 22:51:30 -05:00
mark_story
15ca2400bc Fixing issue in DboSource::name() where special characters in column names would not be correctly quoted.
Tests added.
Fixes #1264
2010-11-25 06:52:23 -05:00
José Lorenzo Rodríguez
40418de218 Freeing up some memory in dbos after the result set has been completly fetched.
Adding dbo_mysql and dbo_postgres to the AllDAtabase testsuite
2010-11-16 23:59:24 -04:30
José Lorenzo Rodríguez
c0f10437ea Adding a few transactions to speed up a little tests involving fixtures 2010-11-16 23:14:48 -04:30
José Lorenzo Rodríguez
1326707c9d Implementing transaction nesting, this will allow to open multiple transactions that will only be commited if all transactions succesfully calls commit() 2010-11-16 22:56:23 -04:30
José Lorenzo Rodríguez
a335891eba mapping lastNumRows to lastAffectedRows as it is not possible to do the first one using PDO 2010-11-16 02:02:08 -04:30
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
José Lorenzo Rodríguez
47c6132b24 cleaning up some tests, adding missing parameters in DboSource to match declaration on DataSource 2010-11-09 01:25:05 -04:30
José Lorenzo Rodríguez
6028705c72 Moving more methods out from DboSourceTest 2010-11-03 19:52:49 -04:30
José Lorenzo Rodríguez
eedd823fd8 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-03 00:23:18 -04:30
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
José Lorenzo Rodríguez
1acb619e75 Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC 2010-10-24 19:59:54 -04:30
José Lorenzo Rodríguez
139702e91c Moving methods from Dbo's to the parent class as PDO already abstract what they do 2010-10-21 20:48:26 -04:30
José Lorenzo Rodríguez
c7763b316e Fixing some boolean issues in DboPostgres 2010-10-21 20:34:11 -04:30
José Lorenzo Rodríguez
0ffe6de9e4 Allowing multiple sql sentences to be executed only for creting or altering databases 2010-10-20 23:57:00 -04:30
mark_story
498417203b Making DboSource::fields() use cacheMethod() so it respects $cacheMethods.
Test added.
Fixes #1211
2010-10-20 22:28:31 -04:00
José Lorenzo Rodríguez
aedf69dee1 More refactoring to DboSource::value() 2010-10-17 23:55:11 -04:30
José Lorenzo Rodríguez
16463229e5 Fixing return value of DboSource::boolean() 2010-10-17 23:40:51 -04:30
José Lorenzo Rodríguez
d9c9a32ff3 Refactoring DboSource::value() so postgres and mysq behavior is the same, updating test case 2010-10-17 23:38:55 -04:30
José Lorenzo Rodríguez
159776fc00 Refactoring possible common code to DboSource, now that PDO abstract disconnection from source 2010-10-17 23:37:56 -04:30
José Lorenzo Rodríguez
28685dc234 More replacements of assignation by reference 2010-10-17 19:20:21 -04:30
José Lorenzo Rodríguez
bcc1417e5d Making database stats dependent of fullDebug
Leaving lastNumRows commented out until some bugs are solved
2010-10-17 18:36:35 -04:30
José Lorenzo Rodríguez
c016f1d97b Impriving documentation 2010-10-17 11:28:11 -04:30
José Lorenzo Rodríguez
7e2fe43ee3 FIxing query caching to take in account bound parameters 2010-10-17 10:51:54 -04:30
José Lorenzo Rodríguez
097191213b Removing use of third parameter of fetchAll() 2010-10-17 10:32:02 -04:30
José Lorenzo Rodríguez
65a641af23 Improving fetchAll method to accept an array of aprameters to be bound to the query, so now it is possible to use proper prepared statements 2010-10-17 10:29:01 -04:30
José Lorenzo Rodríguez
082873721c Changing param order in execute() to maintain compatibility, making all tests pass 2010-10-16 20:28:07 -04:30
José Lorenzo Rodríguez
25915bd931 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-10-16 14:20:58 -04:30
José Lorenzo Rodríguez
7a7659d063 Removing DboMysqlBase as the inner driver selection will be delegated to PDO, extracting _execute() and adding it to DboSource 2010-10-15 19:01:28 -04:30
José Lorenzo Rodríguez
c54448d205 Initial steps toward getting complete query results in DboMysql using PDO 2010-10-15 17:05:30 -04:30
José Lorenzo Rodríguez
70ed9a7b12 Fixing DboMysql::index() method 2010-10-15 17:02:37 -04:30
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
d56416456c Applying patch from 'Justas Butkus' to DboSource
Fixes issues where reconnect could issue warnings related to
array_merge.  Fixes #1182
2010-10-11 21:52:10 -04:00
mark_story
f847080cbf Changing more php version strings. 2010-10-03 12:46:03 -04:00
mark_story
f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
mark_story
729a45703b Fixing issue where table names with spaces would not be quoted by name(). Fixes #1121 2010-09-21 20:34:27 -04:00
mark_story
d113d7d612 Removing dead code from DboSource::fields()
Updating fields() to use implode, so complex virtual fields are better handled.  Fixes #1079
2010-09-18 00:04:36 -04:00