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

[AIRFLOW-3189] Remove schema from get_uri response if None #6833

Merged
merged 1 commit into from
Dec 17, 2019

Conversation

zuku1985
Copy link
Contributor

"None" was appended to URI if schema=None. A check was added if
schema is None.

Make sure you have checked all steps below.

Jira

  • My PR addresses the following Airflow Jira issues and references them in the PR title. For example, "[AIRFLOW-XXX] My Airflow PR"
    • https://issues.apache.org/jira/browse/AIRFLOW-3189
    • In case you are fixing a typo in the documentation you can prepend your commit with [AIRFLOW-XXX], code changes always need a Jira issue.
    • In case you are proposing a fundamental code change, you need to create an Airflow Improvement Proposal (AIP).
    • In case you are adding a dependency, check if the license complies with the ASF 3rd Party License Policy.

Description

In DbApiHook method get_uri "None" was appended to uri when schema was not set. This PR adds check if schema is None.

  • Here are some details about my PR, including screenshots of any UI changes:

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:
    test_get_uri_schema_not_none and test_get_uri_schema_none in TestDbApiHook

Commits

  • My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

Documentation

  • In case of new functionality, my PR adds documentation that describes how to use it.
    • All the public functions and the classes in the PR contain docstrings that explain what it does
    • If you implement backwards incompatible changes, please leave a note in the Updating.md so we can assign it to a appropriate release

"None" was appended to uri if schema=None. Check was added if
schema is None.
Copy link
Member

@potiuk potiuk left a comment

Choose a reason for hiding this comment

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

Nice one !

@codecov-io
Copy link

Codecov Report

Merging #6833 into master will decrease coverage by 0.29%.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #6833     +/-   ##
========================================
- Coverage   84.59%   84.3%   -0.3%     
========================================
  Files         676     676             
  Lines       38337   38361     +24     
========================================
- Hits        32433   32342     -91     
- Misses       5904    6019    +115
Impacted Files Coverage Δ
airflow/hooks/dbapi_hook.py 91.73% <100%> (+0.21%) ⬆️
airflow/kubernetes/volume_mount.py 44.44% <0%> (-55.56%) ⬇️
airflow/kubernetes/volume.py 52.94% <0%> (-47.06%) ⬇️
airflow/kubernetes/pod_launcher.py 45.25% <0%> (-46.72%) ⬇️
...rflow/contrib/operators/kubernetes_pod_operator.py 73.73% <0%> (-24.99%) ⬇️
airflow/kubernetes/refresh_config.py 50.98% <0%> (-23.53%) ⬇️
airflow/utils/dag_processing.py 87.8% <0%> (+0.19%) ⬆️
airflow/jobs/backfill_job.py 91.59% <0%> (+0.86%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 465c1f8...1859f04. Read the comment docs.

@potiuk potiuk merged commit e3bd2a2 into apache:master Dec 17, 2019
@potiuk
Copy link
Member

potiuk commented Dec 17, 2019

Nice one ! Thanks @zuku1985 !

potiuk pushed a commit that referenced this pull request Dec 17, 2019
"None" was appended to uri if schema=None. Check was added if
schema is None.

(cherry picked from commit e3bd2a2)
@potiuk
Copy link
Member

potiuk commented Dec 17, 2019

Also cherry-picked to 1.10.7

kaxil pushed a commit that referenced this pull request Dec 17, 2019
"None" was appended to uri if schema=None. Check was added if
schema is None.

(cherry picked from commit e3bd2a2)
kaxil pushed a commit that referenced this pull request Dec 18, 2019
"None" was appended to uri if schema=None. Check was added if
schema is None.

(cherry picked from commit e3bd2a2)
ashb pushed a commit that referenced this pull request Dec 19, 2019
"None" was appended to uri if schema=None. Check was added if
schema is None.

(cherry picked from commit e3bd2a2)
KKcorps pushed a commit to KKcorps/airflow that referenced this pull request Dec 21, 2019
"None" was appended to uri if schema=None. Check was added if
schema is None.
galuszkak pushed a commit to FlyrInc/apache-airflow that referenced this pull request Mar 5, 2020
"None" was appended to uri if schema=None. Check was added if
schema is None.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants