mirror of
https://github.com/FirebirdSQL/firebird-qa.git
synced 2025-01-22 13:33:07 +01:00
Release 0.15.2. Fixed DB init script encoding/charset
This commit is contained in:
parent
7d0bbb838c
commit
bfc92a15fa
@ -2,6 +2,12 @@
|
|||||||
Changelog
|
Changelog
|
||||||
#########
|
#########
|
||||||
|
|
||||||
|
Version 0.15.2
|
||||||
|
==============
|
||||||
|
|
||||||
|
* Fix problem with database init script. Now it uses the database charset instead default
|
||||||
|
UTF8. The UTF8 is used only when database charset is not specified.
|
||||||
|
|
||||||
Version 0.15.1
|
Version 0.15.1
|
||||||
==============
|
==============
|
||||||
|
|
||||||
|
@ -23,10 +23,10 @@ copyright = '2022, Pavel Cisar'
|
|||||||
author = 'Pavel Císař'
|
author = 'Pavel Císař'
|
||||||
|
|
||||||
# The short X.Y version
|
# The short X.Y version
|
||||||
version = '0.15.1'
|
version = '0.15.2'
|
||||||
|
|
||||||
# The full version, including alpha/beta/rc tags
|
# The full version, including alpha/beta/rc tags
|
||||||
release = '0.15.1'
|
release = '0.15.2'
|
||||||
|
|
||||||
|
|
||||||
# -- General configuration ---------------------------------------------------
|
# -- General configuration ---------------------------------------------------
|
||||||
|
@ -652,10 +652,16 @@ class Database:
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
__tracebackhide__ = True
|
__tracebackhide__ = True
|
||||||
result = run([_vars_['isql'], '-ch', 'UTF8', '-user', self.user,
|
params = [_vars_['isql'], '-user', self.user, '-password', self.password]
|
||||||
'-password', self.password, str(self.dsn)],
|
if self.charset != 'NONE':
|
||||||
input=substitute_macros(script, self.subs),
|
params.extend(['-ch', self.charset])
|
||||||
encoding='utf8', capture_output=True)
|
io_enc = CHARSET_MAP[self.charset]
|
||||||
|
else:
|
||||||
|
params.extend(['-ch', 'utf8'])
|
||||||
|
io_enc = 'utf8'
|
||||||
|
params.append(str(self.dsn))
|
||||||
|
result = run(params, input=substitute_macros(script, self.subs), encoding=io_enc,
|
||||||
|
capture_output=True)
|
||||||
if result.returncode:
|
if result.returncode:
|
||||||
print(f"-- stdout {'-' * 20}")
|
print(f"-- stdout {'-' * 20}")
|
||||||
print(result.stdout)
|
print(result.stdout)
|
||||||
|
@ -5,7 +5,7 @@ all-files=True
|
|||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
name = firebird-qa
|
name = firebird-qa
|
||||||
version = 0.15.1
|
version = 0.15.2
|
||||||
description = pytest plugin for Firebird QA
|
description = pytest plugin for Firebird QA
|
||||||
long_description = file: README.rst
|
long_description = file: README.rst
|
||||||
long_description_content_type = text/x-rst; charset=UTF-8
|
long_description_content_type = text/x-rst; charset=UTF-8
|
||||||
|
Loading…
Reference in New Issue
Block a user