Skip to content

feat: [MySQLi] add config to use MYSQLI_OPT_INT_AND_FLOAT_NATIVE #7265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Feb 22, 2023
Merged

feat: [MySQLi] add config to use MYSQLI_OPT_INT_AND_FLOAT_NATIVE #7265

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d44812d
Enhance: [MySQLi] use MYSQLI_OPT_INT_AND_FLOAT_NATIVE.
kai890707 Feb 16, 2023
43e6767
Merge branch 'codeigniter4:4.4' into 4.4
kai890707 Feb 17, 2023
47833d2
Enhance:[MySQLi] Use the option to define whether MYSQLI_OPT_INT_AND_…
kai890707 Feb 17, 2023
f0a71b9
Merge branch 'codeigniter4:4.4' into 4.4
kai890707 Feb 18, 2023
be1eab9
fix:Rename the DBTypeNative to numberNative and move the property to …
kai890707 Feb 18, 2023
7b756d1
Enhance:Add numberNative to configuration.rst to specify whether MYSQ…
kai890707 Feb 18, 2023
4ff2ffe
fix:Configuration.rst typesetting corrections.
kai890707 Feb 18, 2023
d017a0b
Enhance:Add and complete test files for NumberNative.
kai890707 Feb 18, 2023
1cd3415
fix:NumberNativeTest.php adds DBDriver's judgment test and fixes MySQ…
kai890707 Feb 19, 2023
7b152df
fix:Column description of numberNative in CodeIgniter4/user_guide_src…
kai890707 Feb 19, 2023
c18581d
fix:Run composer cs-fix and modify the Enhancements/DataBase descript…
kai890707 Feb 19, 2023
b2c74e8
fix:Modify the Enhancements/DataBase description in user_guide_src/so…
kai890707 Feb 19, 2023
78ff0a9
fix:Modify database/configuration.rst and changelogs/v4.4.0.rst descr…
kai890707 Feb 19, 2023
0a8c971
fix:Modify changelogs/v4.4.0.rst description and remove the numberNat…
kai890707 Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions app/Config/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,24 @@ class Database extends Config
* The default database connection.
*/
public array $default = [
'DSN' => '',
'hostname' => 'localhost',
'username' => '',
'password' => '',
'database' => '',
'DBDriver' => 'MySQLi',
'DBPrefix' => '',
'pConnect' => false,
'DBDebug' => true,
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
'encrypt' => false,
'compress' => false,
'strictOn' => false,
'failover' => [],
'port' => 3306,
'DSN' => '',
'hostname' => 'localhost',
'username' => '',
'password' => '',
'database' => '',
'DBDriver' => 'MySQLi',
'DBPrefix' => '',
'pConnect' => false,
'DBDebug' => true,
'charset' => 'utf8',
'DBCollat' => 'utf8_general_ci',
'swapPre' => '',
'encrypt' => false,
'compress' => false,
'strictOn' => false,
'failover' => [],
'port' => 3306,
'DBTypeNative' => false,
];

/**
Expand Down
8 changes: 8 additions & 0 deletions system/Database/BaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* @property string $DBDriver
* @property string $DBPrefix
* @property string $DSN
* @property bool $DBTypeNative
* @property array|bool $encrypt
* @property array $failover
* @property string $hostname
Expand Down Expand Up @@ -339,6 +340,13 @@ abstract class BaseConnection implements ConnectionInterface
*/
protected $queryClass = Query::class;

/**
* Use MYSQLI_OPT_INT_AND_FLOAT_NATIVE
*
* @var bool
*/
protected $DBTypeNative = false;

/**
* Saves our connection settings.
*/
Expand Down
4 changes: 4 additions & 0 deletions system/Database/MySQLi/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ public function connect(bool $persistent = false)
mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);

$this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10);

if(isset($this->DBTypeNative) && $this->DBTypeNative){
$this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE,1);
}

if (isset($this->strictOn)) {
if ($this->strictOn) {
Expand Down