Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
odan committed Mar 4, 2017
2 parents 5a90d38 + 1da4373 commit 7febd96
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,15 @@ Example:
<?php

return array(
'dsn' => 'mysql:host=127.0.0.1;dbname=test',
'dsn' => 'mysql:host=127.0.0.1;dbname=test;charset=utf8mb4',
'username' => 'root',
'password' => '',
'options' => array(
PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_PERSISTENT => false,
PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci',
),
//'pdo' => new PDO('mysql:host=127.0.0.1;dbname=test', 'username', 'password'),
//'pdo' => new PDO('mysql:host=127.0.0.1;dbname=test;charset=utf8mb4', 'username', 'password'),
'schema_file' => __DIR__ . '/schema.php',
'migration_path' => __DIR__
);
Expand Down Expand Up @@ -148,4 +150,4 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) and [CONDUCT](CONDUCT.md) for details

## License

The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
The MIT License (MIT). Please see [License File](LICENSE.md) for more information.

0 comments on commit 7febd96

Please sign in to comment.