Skip to content
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

Jump to bottom

WIP Default to standards-compliant utf8mb4 character set #935

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP Default to standards-compliant utf8mb4 character set #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ $ export PYTEST_HOST=localhost
$ export PYTEST_USER=user
$ export PYTEST_PASSWORD=myclirocks
$ export PYTEST_PORT=3306
$ export PYTEST_CHARSET=utf8
$ export PYTEST_CHARSET=utf8mb4
```

The default values are `localhost`, `root`, no password, `3306`, and `utf8`.
The default values are `localhost`, `root`, no password, `3306`, and `utf8mb4`.
You only need to set the values that differ from the defaults.


Expand Down
2 changes: 1 addition & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Features:
* Allow customization of Pygments SQL syntax-highlighting styles.
* Add a `\clip` special command to copy queries to the system clipboard.
* Add a special command `\pipe_once` to pipe output to a subprocess.

* Default to standards-compliant `utf8mb4` character set.

Bug Fixes:
----------
Expand Down
2 changes: 1 addition & 1 deletion mycli/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def connect(self, database='', user='', passwd='', host='', port='',
ssl = ssl or {}

passwd = passwd if isinstance(passwd, str) else cnf['password']
charset = charset or cnf['default-character-set'] or 'utf8'
charset = charset or cnf['default-character-set'] or 'utf8mb4'

# Favor whichever local_infile option is set.
for local_infile_option in (local_infile, cnf['local-infile'],
Expand Down
2 changes: 1 addition & 1 deletion test/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
USER = os.getenv('PYTEST_USER', 'root')
HOST = os.getenv('PYTEST_HOST', 'localhost')
PORT = int(os.getenv('PYTEST_PORT', 3306))
CHARSET = os.getenv('PYTEST_CHARSET', 'utf8')
CHARSET = os.getenv('PYTEST_CHARSET', 'utf8mb4')
SSH_USER = os.getenv('PYTEST_SSH_USER', None)
SSH_HOST = os.getenv('PYTEST_SSH_HOST', None)
SSH_PORT = os.getenv('PYTEST_SSH_PORT', 22)
Expand Down