From 6245a1b5cb3d83f72bf20bd17cb0613f58bd177f Mon Sep 17 00:00:00 2001 From: Jim Parry Date: Thu, 26 Sep 2019 21:54:23 -0700 Subject: [PATCH] Fix changelog [ci skip] --- user_guide_src/source/changelogs/next.rst | 9 +++++---- user_guide_src/source/database/query_builder.rst | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/changelogs/next.rst b/user_guide_src/source/changelogs/next.rst index d32cbc5f3a9f..a7ebd28d4690 100644 --- a/user_guide_src/source/changelogs/next.rst +++ b/user_guide_src/source/changelogs/next.rst @@ -8,7 +8,7 @@ Release Date: Not released Enhancements: - query builder testability simplified with new property, but dropped -method parameters (breaking change) + method parameters (breaking change) - database, migrations and sessions beefed up - numerous smaller bugs corrected @@ -37,10 +37,10 @@ The list of changed files follows, with PR numbers shown. - Database/ - MySQLi/Connection #2201, 2229 - Postgre/ - - BaseBuilder #2269 + - BaseBuilder #2269 - Connection #2201 - SQLite3/Connection #2201, 2228, 2230 - - BaseBuilder #2257, 2232, 2269 + - BaseBuilder #2257, 2232, 2269, 2270 - BaseConnection #2208, 2213, 2231 - Config #2224 - Forge #2205 @@ -164,9 +164,10 @@ The list of changed files follows, with PR numbers shown. PRs merged: ----------- +-------------------------- - #2271 fix ResourcePresenter::setModel() +- #2270 groupStart() refactorization - #2269 testMode() method for BaseBuilder - #2268 Validation session use only if exists - #2267 Tests setUp and tearDown: void diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index e8286de8b4e0..8d08aa36fc64 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -1333,10 +1333,10 @@ Class Reference .. php:method:: from($from[, $overwrite = FALSE]) - :param mixed $from: Table name(s); string or array - :param bool $overwrite Should we remove the first table existing? - :returns: BaseBuilder instance (method chaining) - :rtype: BaseBuilder + :param mixed $from: Table name(s); string or array + :param bool $overwrite: Should we remove the first table existing? + :returns: BaseBuilder instance (method chaining) + :rtype: BaseBuilder Specifies the FROM clause of a query.