Skip to content

Commit

Permalink
Merge master into sql-ambigious
Browse files Browse the repository at this point in the history
  • Loading branch information
aljazerzen committed Nov 18, 2024
2 parents 6ce3c9a + 4b339e5 commit 60ab6f8
Show file tree
Hide file tree
Showing 75 changed files with 2,144 additions and 440 deletions.
2 changes: 1 addition & 1 deletion .github/workflows.src/tests.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
steps.postgres-cache.outputs.cache-hit != 'true'
run: |
sudo apt-get update
sudo apt-get install -y uuid-dev libreadline-dev bison flex
sudo apt-get install -y uuid-dev libreadline-dev bison flex libprotobuf-c-dev
- name: Install Rust toolchain
if: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-ha.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tests-inplace.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tests-managed-pg.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tests-patches.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tests-pg-versions.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tests-pool.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tests.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
*.pyo
*.o
*.so
.vscode
.vscode/
.zed/
*~
.#*
.*.swp
Expand Down Expand Up @@ -37,3 +38,4 @@ docs/_build
/.vagga
/.dmypy.json
/compile_commands.json
/pyrightconfig.json
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
url = https://github.com/MagicStack/py-pgproto.git
[submodule "edb/pgsql/parser/libpg_query"]
path = edb/pgsql/parser/libpg_query
url = https://github.com/msullivan/libpg_query.git
url = https://github.com/edgedb/libpg_query.git
5 changes: 3 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ rust: build-reqs
BUILD_EXT_MODE=rust-only python setup.py build_ext --inplace


cli: build-reqs
python setup.py build_cli


docs: build-reqs
find docs -name '*.rst' | xargs touch
$(MAKE) -C docs html SPHINXOPTS=$(SPHINXOPTS) BUILDDIR="../build"
Expand All @@ -39,6 +43,10 @@ parsers:
python setup.py build_parsers --inplace


libpg-query:
python setup.py build_libpg_query


ui: build-reqs
python setup.py build_ui

Expand Down
2 changes: 1 addition & 1 deletion docs/changelog/1_0_rc2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ Server configuration

``EDGEDB_SERVER_SECURITY``
- ``strict == default``
- ``insecure_dev_mode`` — disable password-based authentication and allow
- ``insecure_dev_mode`` — disable password-based authentication and allow
unencrypted HTTP traffic

``EDGEDB_DOCKER_APPLY_MIGRATIONS`` (Docker only)
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Reference
backend_ha
configuration
http
sql_support
sql_adapter
protocol/index
bindings/index
admin/index
Expand Down
Loading

0 comments on commit 60ab6f8

Please sign in to comment.