From 61c4d0a22e63d44bb07d9a3c5f0da030dd5b5ef9 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 20 Dec 2012 16:29:29 +0200 Subject: [ci skip] Minor style/spacing changes following PR #2087 --- system/database/DB_utility.php | 18 +++++++++--------- system/database/drivers/mysql/mysql_utility.php | 4 ++-- system/database/drivers/mysqli/mysqli_utility.php | 4 ++-- user_guide_src/source/changelog.rst | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index aff3cf8c2..4562b973a 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -320,15 +320,15 @@ abstract class CI_DB_utility { // Set up our default preferences $prefs = array( - 'tables' => array(), - 'ignore' => array(), - 'filename' => '', - 'format' => 'gzip', // gzip, zip, txt - 'add_drop' => TRUE, - 'add_insert' => TRUE, - 'newline' => "\n", - 'foreign_key_checks' => TRUE - ); + 'tables' => array(), + 'ignore' => array(), + 'filename' => '', + 'format' => 'gzip', // gzip, zip, txt + 'add_drop' => TRUE, + 'add_insert' => TRUE, + 'newline' => "\n", + 'foreign_key_checks' => TRUE + ); // Did the user submit any preferences? If so set them.... if (count($params) > 0) diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php index f118033dc..94ef95ae0 100644 --- a/system/database/drivers/mysql/mysql_utility.php +++ b/system/database/drivers/mysql/mysql_utility.php @@ -80,7 +80,7 @@ class CI_DB_mysql_utility extends CI_DB_utility { // Do we need to include a statement to disable foreign key checks? if ($foreign_key_checks === FALSE) { - $output .= "SET foreign_key_checks = 0;".$newline; + $output .= 'SET foreign_key_checks = 0;'.$newline; } foreach ( (array) $tables as $table) @@ -191,7 +191,7 @@ class CI_DB_mysql_utility extends CI_DB_utility { // Do we need to include a statement to re-enable foreign key checks? if ($foreign_key_checks === FALSE) { - $output .= "SET foreign_key_checks = 1;".$newline; + $output .= 'SET foreign_key_checks = 1;'.$newline; } return $output; diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php index 2edf38cf5..f6688bcb5 100644 --- a/system/database/drivers/mysqli/mysqli_utility.php +++ b/system/database/drivers/mysqli/mysqli_utility.php @@ -80,7 +80,7 @@ class CI_DB_mysqli_utility extends CI_DB_utility { // Do we need to include a statement to disable foreign key checks? if ($foreign_key_checks === FALSE) { - $output .= "SET foreign_key_checks = 0;".$newline; + $output .= 'SET foreign_key_checks = 0;'.$newline; } foreach ( (array) $tables as $table) @@ -191,7 +191,7 @@ class CI_DB_mysqli_utility extends CI_DB_utility { // Do we need to include a statement to re-enable foreign key checks? if ($foreign_key_checks === FALSE) { - $output .= "SET foreign_key_checks = 1;".$newline; + $output .= 'SET foreign_key_checks = 1;'.$newline; } return $output; diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index cc9afc45c..5534a1ee7 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -184,7 +184,7 @@ Release Date: Not Released - Added support for passing a custom database object to the loader. - Modified the class to no longer extend :doc:`Database Forge `, which has been a deprecated behavior for awhile. - Overall improved support for all of the drivers. - - Added 'foreign_key_checks' option to MySQL/MySQLi backup, allowing statement to disable/re-enable foreign key checks to be inserted into the backup output. + - Added *foreign_key_checks* option to MySQL/MySQLi backup, allowing statement to disable/re-enable foreign key checks to be inserted into the backup output. - Libraries -- cgit v1.2.3-24-g4f1b