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.

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

DSN parameter: support for "index_include_frozen" #151

Merged
merged 3 commits into from
May 17, 2019

Conversation

bpintea
Copy link
Collaborator

@bpintea bpintea commented May 2, 2019

This PR adds the support for the configuration of the index_include_frozen parameter of ES/SQL (elastic/elasticsearch#41558): the DSN parameter is called IndexIncludeFrozen.

The PR also changes the unit tests to centralize the way the generated JSON request is verified against an expected value: the ConnectedDBC class now has two new function members and these will construct the expected JSON object. This allows to easily support addition of any request configuration parameters, besides removing quite some code duplication.

bpintea added 3 commits May 2, 2019 16:46
Introduce new ConnectedDBC class member function to validate the
generated request; thus removing code duplication in tests and allowing
for easier change of the request format when introducing new request
settings.
Form the expected JSON request using the same defs as used in the
driver.
Introduce new request setting "to allow all queries inside one
connection to include frozen indices. If [false], the user would have to
manually mention this through INCLUDE FROZEN and FROZEN".
Copy link
Contributor

@droberts195 droberts195 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bpintea bpintea merged commit d35ae29 into elastic:master May 17, 2019
@bpintea bpintea deleted the feat/frozen_idx_param branch May 17, 2019 20:02
@bpintea bpintea added the >feature Applicable to PRs adding new functionality label May 18, 2019
bpintea added a commit that referenced this pull request May 18, 2019
* C2SQL conversion tests: new class fn for requests

Introduce new ConnectedDBC class member function to validate the
generated request; thus removing code duplication in tests and allowing
for easier change of the request format when introducing new request
settings.

* use JSON keys defined in driver for unit testing

Form the expected JSON request using the same defs as used in the
driver.

* introduce new "index_include_frozen" request param

Introduce new request setting "to allow all queries inside one
connection to include frozen indices. If [false], the user would have to
manually mention this through INCLUDE FROZEN and FROZEN".

(cherry picked from commit d35ae29)
bpintea added a commit to bpintea/elasticsearch-sql-odbc that referenced this pull request Jul 2, 2019
Partially revert elastic#151, removing the support for the "index_include_frozen".

Close elastic#159
bpintea added a commit that referenced this pull request Jul 2, 2019
Partially revert #151, removing the support for the "index_include_frozen".

Close #159
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>feature Applicable to PRs adding new functionality v7.2.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants