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

Add trim_char_fields connection argument #120

Merged
merged 8 commits into from
Sep 8, 2021
Merged

Add trim_char_fields connection argument #120

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fcfb112
Add trim_char_fields connection argumen
qtemp Sep 3, 2021
705685b
Extend comment for trim_char_fields indicating it defaults to False
qtemp Sep 8, 2021
2c6d07d
Revise trim_char_fields & use_system_naming for exceptions
qtemp Sep 8, 2021
679ec14
Missed colon
qtemp Sep 8, 2021
9a9fb2a
Merge branch 'IBM:master' into trim_char_fields
qtemp Sep 8, 2021
307dfc5
Remove parenthesis from single condition exceptions
qtemp Sep 8, 2021
118b506
Fix wrapping for for 80 column
qtemp Sep 8, 2021
6f44048
Removed parenthesis on single value exception for use_system_naming
qtemp Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions sqlalchemy_ibmi/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
* ``use_system_naming`` - If ``True``, the connection is set to use the System
naming convention, otherwise it will use the SQL naming convention.
Defaults to ``False``.
* ``trim_char_fields`` - If ``True``, all character fields will be returned
with trailing spaces truncated. Defaults to ``False``.

create-engine arguments:

Expand Down Expand Up @@ -791,7 +793,7 @@ def create_connect_args(self, url):
opts.update(url.query)
allowed_opts = {'system', 'user', 'password', 'autocommit', 'readonly',
'timeout', 'database', 'use_system_naming',
'library_list', 'current_schema'
'library_list', 'current_schema', 'trim_char_fields'
}

if not allowed_opts.issuperset(opts.keys()):
Expand All @@ -800,9 +802,19 @@ def create_connect_args(self, url):

try:
opts['Naming'] = str(util.strtobool(opts['use_system_naming']))
except (ValueError, KeyError):
except KeyError:
opts['Naming'] = '0'
except ValueError:
raise ValueError("Invalid value specified for use_system_naming")

try:
trim_char_fields = opts.pop('trim_char_fields')
opts['TrimCharFields'] = str(util.strtobool(trim_char_fields))
except KeyError:
pass
except ValueError:
raise ValueError("Invalid value specified for trim_char_fields")

if 'current_schema' in opts or 'library_list' in opts:
opts['DefaultLibraries'] = opts.pop('current_schema', '') + ','
if isinstance(opts["DefaultLibraries"], str):
Expand Down