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

Use official upstream release + patches, remove flex/bison dependency #35

Merged
merged 3 commits into from
Oct 16, 2015

Conversation

lfittl
Copy link
Member

@lfittl lfittl commented Oct 5, 2015

For a long time pg_query has been using a forked version of upstream, with two patches applied:

  • Output internal node structures generated by the parser as JSON
  • Ability to parse normalized statements that contain ? replacement characters

This PR changes this to using an actual upstream release (latest on 9.4 branch) + patches, which has the added benefit that we no longer require flex/bison to be installed (since the release ships with pre-generated files).

Fixes #31.

@lfittl
Copy link
Member Author

lfittl commented Oct 5, 2015

@mme This should resolve the Heroku deployment issues for you :)

@lfittl
Copy link
Member Author

lfittl commented Oct 13, 2015

Alright, this is basically ready to merge, but still a fairly substantial change to how the build works.

@JackDanger could you also give this branch a try to make sure it doesn't break hsql? Much appreciated! :)

lfittl added a commit that referenced this pull request Oct 16, 2015
Use official upstream release + patches, remove flex/bison dependency
@lfittl lfittl merged commit 91d2410 into master Oct 16, 2015
@lfittl lfittl mentioned this pull request Oct 16, 2015
@lfittl lfittl deleted the use-upstream-and-patches branch March 7, 2016 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant