Skip to content

Commit 8c5fb0e

Browse files
authored
Merge pull request #118 from andrex47/v3
V3
2 parents 4a12820 + bd7a484 commit 8c5fb0e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"wiki": "https://github.com/uepg/laravel-sybase/wiki"
2121
},
2222
"require": {
23-
"php": "^5.6.4 || ^7.0 || ^8.0",
23+
"php": ">=5.5.9 <7.4",
2424
"doctrine/dbal": "^2.5",
25-
"illuminate/database": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*",
26-
"illuminate/support": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*"
25+
"illuminate/database": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*",
26+
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*"
2727
},
2828
"extra": {
2929
"laravel": {

src/Database/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function configureExtraSettings($config = [])
8383
throw new \Exception('When application encoding is configured, you need to set up application_charset and database_charset');
8484
}
8585
$this->applicationCharset = $config['application_charset'];
86-
$this->databaseCharset = $config['charset'];
86+
$this->databaseCharset = $config['database_charset'];
8787
}
8888
}
8989

0 commit comments

Comments
 (0)