Skip to content
Snippets Groups Projects
Commit b81a8214 authored by Anton Gusev's avatar Anton Gusev
Browse files

add DB_CHARSET params to settings

parent 6fabb98d
No related branches found
No related tags found
2 merge requests!5Develop,!4Develop
...@@ -7,4 +7,5 @@ alembic.ini ...@@ -7,4 +7,5 @@ alembic.ini
__pycache__ __pycache__
*.json *.json
src/spiders/Test*.py src/spiders/Test*.py
*.log *.log
\ No newline at end of file statistics.txt
\ No newline at end of file
...@@ -6,6 +6,7 @@ DB_PORT=3306 ...@@ -6,6 +6,7 @@ DB_PORT=3306
DB_DATABASE=database DB_DATABASE=database
DB_USERNAME=username DB_USERNAME=username
DB_PASSWORD=secret DB_PASSWORD=secret
DB_CHARSET=utf8mb4
### MAIL CONFIG ### MAIL CONFIG
MAIL_FROM = 'example@example.com' MAIL_FROM = 'example@example.com'
......
...@@ -36,7 +36,7 @@ script_location = database ...@@ -36,7 +36,7 @@ script_location = database
# output_encoding = utf-8 # output_encoding = utf-8
# sqlalchemy.url = driver://user:pass@host:port/dbname # sqlalchemy.url = driver://user:pass@host:port/dbname
sqlalchemy.url = mysql+pymysql://user:password@localhost/databasename sqlalchemy.url = mysql+pymysql://user:password@localhost/databasename?utf8mb4
# Logging configuration # Logging configuration
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import logging import logging
from dotenv import load_dotenv from dotenv import load_dotenv
import os import os
true_list = ['True', 'true', 'TRUE', 1, '1'] true_list = ['True', 'true', 'TRUE', 1, '1']
load_dotenv() load_dotenv()
...@@ -103,13 +104,15 @@ DB_PASSWORD = os.getenv('DB_PASSWORD') ...@@ -103,13 +104,15 @@ DB_PASSWORD = os.getenv('DB_PASSWORD')
DB_HOST = os.getenv('DB_HOST') DB_HOST = os.getenv('DB_HOST')
DB_PORT = int(os.getenv('DB_PORT')) DB_PORT = int(os.getenv('DB_PORT'))
DB_DATABASE = os.getenv('DB_DATABASE') DB_DATABASE = os.getenv('DB_DATABASE')
CONNECTION_STRING = "{drivername}://{user}:{passwd}@{host}:{port}/{db_name}?charset=utf8".format( DB_CHARSET = os.getenv('DB_CHARSET')
CONNECTION_STRING = "{drivername}://{user}:{passwd}@{host}:{port}/{db_name}?charset={db_charset}".format(
drivername=DB_CONNECTION, drivername=DB_CONNECTION,
user=DB_USERNAME, user=DB_USERNAME,
passwd=DB_PASSWORD, passwd=DB_PASSWORD,
host=DB_HOST, host=DB_HOST,
port=str(DB_PORT), port=str(DB_PORT),
db_name=DB_DATABASE, db_name=DB_DATABASE,
db_charset=DB_CHARSET,
) )
# Logger config # Logger config
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment