Skip to content

Fix logical merge conflict #865

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

Merged
merged 1 commit into from
May 2, 2023
Merged

Fix logical merge conflict #865

merged 1 commit into from
May 2, 2023

Conversation

alamb
Copy link
Contributor

@alamb alamb commented May 2, 2023

I believe there was a logical conflict between #852 and #858

@alamb alamb merged commit be85f54 into apache:main May 2, 2023
@alamb alamb deleted the alamb/fix_compile branch May 2, 2023 11:08
serprex pushed a commit to serprex/sqlparser-rs that referenced this pull request Nov 6, 2023
* Support identifiers beginning with digits in MySQL (apache#856)

* support COPY INTO in snowflake (apache#841)

Signed-off-by: Pawel Leszczynski <leszczynski.pawel@gmail.com>

* Add `dialect_from_str` and improve `Dialect` documentation (apache#848)

* Add `dialect_from_str` and improve `Dialect` documentation

* cleanup

* fix compilation with nostd

* Support multiple-table DELETE syntax (apache#855)

* Support `DISTINCT ON (...)` (apache#852)

* Support "DISTINCT ON (...)"

* a test

* fix the merge

* Test trailing commas (apache#859)

* test: add tests for trailing commas

* tweaks

* Add support for query source in COPY .. TO statement (apache#858)

* Add support for query source in COPY .. TO statement

* Fix compile error

* Fix logical merge conflict (apache#865)

* Fix tiny typo in custom_sql_parser.md (apache#864)

* Make Expr::Interval its own struct (apache#872)

* Make Expr::Interval its own struct

* Add test interval display

* Fix cargo fmt

* Include license file in published crate (apache#871)

* Add support for multiple expressions, order by in aggregations (apache#879)

* Add support for multiple expressions, order by in aggregations

* Fix formatting errors

* Resolve linter errors

* Add parse_multipart_identifier function to parser (apache#860)

* Add parse_multipart_identifier function to parser

* Update doc for parse_multipart_identifier

* Fix conflict

* feat: Add custom operator (apache#868)

* feat: Add custom operator

From apache#863

- It doesn't parse anything — I'm not sure how to parse ` SELECT 'a' REGEXP '^[a-d]';` with `REGEXP` as the operator... (but fine for my narrow purpose)
- If we need tests, where would I add them?

* Update src/ast/operator.rs

---------

Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>

* feat: Support MySQL's `DIV` operator (apache#876)

* feat: MySQL's DIV operator

* fix: do not use `_` prefix for used variable

---------

Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>

* truncate: table as optional keyword (apache#883)

Signed-off-by: Maciej Obuchowski <obuchowski.maciej@gmail.com>

* feat: add DuckDB dialect (apache#878)

* feat: add DuckDB dialect

* formatting

* fix conflict

* support // in GenericDialect

* add DucDbDialect to all_dialects

* add comment from suggestion

Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>

* fix: support // in GenericDialect

---------

Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>

* Add support for first, last aggregate function parsing (apache#882)

* Add order by parsing to functions

* Fix doc error

* minor changes

* Named window frames (apache#881)

* after over clause, named window can be parsed with window ... as after having clause

* Lint errors are fixed

* Support for multiple windows

* fix lint errors

* simplifications

* rename function

* Rewrite named window search in functional style

* Test added and some minor changes

* Minor changes on tests and namings, and semantic check is removed

---------

Co-authored-by: Mustafa Akur <mustafa.akur@synnada.ai>
Co-authored-by: Mehmet Ozan Kabak <ozankabak@gmail.com>

* Fix merge conflict (apache#885)

* Update CHANGELOG for `0.34.0` release (apache#884)

* chore: Release sqlparser version 0.34.0

* Update criterion requirement from 0.4 to 0.5 in /sqlparser_bench (apache#890)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: Pawel Leszczynski <leszczynski.pawel@gmail.com>
Signed-off-by: Maciej Obuchowski <obuchowski.maciej@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: AviRaboah <91826424+AviRaboah@users.noreply.github.com>
Co-authored-by: pawel.leszczynski <leszczynski.pawel@gmail.com>
Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
Co-authored-by: Aljaž Mur Eržen <aljazerzen@users.noreply.github.com>
Co-authored-by: Armin Primadi <aprimadi@gmail.com>
Co-authored-by: Okue <nogideca@gmail.com>
Co-authored-by: Andrew Kane <acekane1@gmail.com>
Co-authored-by: Mustafa Akur <106137913+mustafasrepo@users.noreply.github.com>
Co-authored-by: Jeffrey <22608443+Jefffrey@users.noreply.github.com>
Co-authored-by: Maximilian Roos <5635139+max-sixty@users.noreply.github.com>
Co-authored-by: eitsupi <50911393+eitsupi@users.noreply.github.com>
Co-authored-by: Maciej Obuchowski <obuchowski.maciej@gmail.com>
Co-authored-by: Berkay Şahin <124376117+berkaysynnada@users.noreply.github.com>
Co-authored-by: Mustafa Akur <mustafa.akur@synnada.ai>
Co-authored-by: Mehmet Ozan Kabak <ozankabak@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.

1 participant