From 1fb500077784638399be79b32fe354aec257413c Mon Sep 17 00:00:00 2001 From: Gabriel Potkány Date: Wed, 4 Feb 2015 01:45:59 +0100 Subject: Fixed inconsistent return types --- user_guide_src/source/database/utilities.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source/database') diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index 2da1f981d..7886be434 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -252,7 +252,7 @@ Class Reference .. php:method:: backup([$params = array()]) :param array $params: An associative array of options - :returns: void + :returns: mixed :rtype: void Perform a database backup, per user preferences. -- cgit v1.2.3-24-g4f1b From cea5fb713822d00460222deaa1cf66543effccf8 Mon Sep 17 00:00:00 2001 From: Gabriel Potkány Date: Wed, 4 Feb 2015 08:22:06 +0100 Subject: Adjusted returns/return types to suggestions --- user_guide_src/source/database/utilities.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_guide_src/source/database') diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index 7886be434..2aeadfdda 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -252,8 +252,8 @@ Class Reference .. php:method:: backup([$params = array()]) :param array $params: An associative array of options - :returns: mixed - :rtype: void + :returns: string + :rtype: string Perform a database backup, per user preferences. -- cgit v1.2.3-24-g4f1b From 40bbd60bcc5135f898f46e502f7b04ef065274e0 Mon Sep 17 00:00:00 2001 From: Gabriel Potkány Date: Wed, 4 Feb 2015 14:06:47 +0100 Subject: Adjusted return type for CI_DB_utility::backup to suggestions --- user_guide_src/source/database/utilities.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source/database') diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index 2aeadfdda..bafa08ed5 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -252,7 +252,7 @@ Class Reference .. php:method:: backup([$params = array()]) :param array $params: An associative array of options - :returns: string + :returns: raw/(g)zipped SQL query string :rtype: string Perform a database backup, per user preferences. -- cgit v1.2.3-24-g4f1b From b4b9bd3fc5bed95c19cd394d9fbf29772e94614a Mon Sep 17 00:00:00 2001 From: Rafael Schwemmer Date: Thu, 5 Feb 2015 15:30:13 +0100 Subject: Update transactions.rst Corrected a grammatical error in "CodeIgniter's Approach to Transactions" --- user_guide_src/source/database/transactions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src/source/database') diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst index e9190e59a..2e6d4b477 100644 --- a/user_guide_src/source/database/transactions.rst +++ b/user_guide_src/source/database/transactions.rst @@ -21,7 +21,7 @@ approach because it greatly simplifies the process of running transactions. In most cases all that is required are two lines of code. Traditionally, transactions have required a fair amount of work to -implement since they demand that you to keep track of your queries and +implement since they demand that you keep track of your queries and determine whether to commit or rollback based on the success or failure of your queries. This is particularly cumbersome with nested queries. In contrast, we've implemented a smart transaction system that does all -- cgit v1.2.3-24-g4f1b