Skip to content

Commit

Permalink
FIX: try
Browse files Browse the repository at this point in the history
  • Loading branch information
drosanda committed Nov 8, 2024
1 parent 462afc2 commit 7c06643
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci

steps:
- name: Checkout code
Expand All @@ -30,7 +31,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.2'
extensions: mbstring, xml, ctype, iconv, intl, pdo, pdo_mysql, dom, filter, gd, json, libxml
coverage: xdebug

Expand Down Expand Up @@ -69,7 +70,11 @@ jobs:
- name: Set up MySQL
run: |
mysql -h127.0.0.1 -uroot -proot -e "CREATE DATABASE IF NOT EXISTS seme_framework;"
mysql -h127.0.0.1 -uroot -proot -e "
ALTER DATABASE seme_framework CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
SET NAMES utf8mb4;
SET character_set_server = utf8mb4;
"
- name: Install dependencies
run: |
Expand Down
10 changes: 5 additions & 5 deletions kero/sine/SENE_MySQLi_Engine.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function __construct()
if (isset($this->config->database->charset) && strlen($this->config->database->charset) > 0) {
$cs = $this->config->database->charset;
}
$this->__mysqli->set_charset($cs);
#$this->__mysqli->set_charset($cs);

self::$__instance = $this;

Expand Down Expand Up @@ -1611,10 +1611,10 @@ public function getCharSet()
}
public function setCharSet($char_set)
{
$res = $this->__mysqli->set_charset($char_set);
if (!$res) {
trigger_error(TEM_ERR.': Cant change charset from '.$this->__mysqli->character_set_name().' to '.$char_set.' to database.');
}
// $res = $this->__mysqli->set_charset($char_set);
// if (!$res) {
// trigger_error(TEM_ERR.': Cant change charset from '.$this->__mysqli->character_set_name().' to '.$char_set.' to database.');
// }
return 1;
}
public function getLastQuery()
Expand Down

0 comments on commit 7c06643

Please sign in to comment.