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

resolve merge conflict on unparsed.py #9309

Merged
merged 24 commits into from
Dec 22, 2023
Merged

resolve merge conflict on unparsed.py #9309

merged 24 commits into from
Dec 22, 2023

Commits on Oct 25, 2023

  1. moving types_pb2.py to common/events

    @colin-rogers-dbt
    colin-rogers-dbt committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    2474722 View commit details
    Browse the repository at this point in the history

  2. merge

    @colin-rogers-dbt
    colin-rogers-dbt committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    07743b7 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    252e3e3 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    ff9d519 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    bf079b1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    3187ded View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    4da67bf View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    c03823f View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    2811ccd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    e88138a View commit details
    Browse the repository at this point in the history

  3. Update parser to support conversion metrics (#9173) 

    * added ConversionTypeParams classes

* updated parser for ConversionTypeParams

* added step to populate input_measure for conversion metrics

* version bump on DSI

* comment back manifest generating line

* updated v12 schemas

* added tests

* added changelog
    @WilliamDee
    WilliamDee committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    1740df5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    977a842 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Remove --dry-run flag from dbt deps (#9169) 

    * Rm --dry-run flag for dbt deps

* Add changelog entry

* Update test

* PR feedback
    @jtcohen6
    jtcohen6 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    6e0a387 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. adding clean_up methods to basic and unique_id tests (#9195) 

    * init attempt of adding clean_up methods to basic and unique_id tests

* swapping cleanup method drop of test_schema to unique_schema to test breakage on docs_generate test

* moving the clean_up method down into class BaseDocsGenerate

* remove drop relation for unique_schema

* manually define alternate_schema for clean_up as not being seen as part of project_config

* add changelog

* remove unneeded changelog

* uncomment line that generates new manifest and delete manifest our changes created

* make sure the manifest test is deleted and readd older version of manifest.json to appease test

* manually revert file to previous commit

* Revert "manually revert file to previous commit"

This reverts commit a755419.
    @McKnight-42
    McKnight-42 committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    c2bc2f0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3ddfcdd View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    082b0c6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    611981f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    3665fb1 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    24690b0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5dbee88 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Merge branch 'feature/decouple-adapters-from-core' of https://github.… 

    …com/dbt-labs/dbt-core into feature/decouple-adapters-from-core
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    d20960f View commit details
    Browse the repository at this point in the history

  2. merge main

    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    d2a1d27 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. merge main

    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    ff9979d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'mergeMainIntoDecoupling1220' of https://github.com/dbt-… 

    …labs/dbt-core into mergeMainIntoDecoupling1220
    @colin-rogers-dbt
    colin-rogers-dbt committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    91a35ea View commit details
    Browse the repository at this point in the history