Skip to content

Commit d074985

Browse files
committed
Update pinned pgx branch to develop
1 parent 624fc03 commit d074985

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

.cargo/config

+3
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ linker = "./.cargo/pgx-linker-script.sh"
1111

1212
[target.aarch64-apple-darwin]
1313
linker = "./.cargo/pgx-linker-script.sh"
14+
15+
[target.x86_64-unknown-freebsd]
16+
linker = "./.cargo/pgx-linker-script.sh"

ADVANCED-INSTALL.md

+19-9
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,27 @@ cargo pgx run pg13
8080
Example output.
8181

8282
```bash
83-
Stopping Postgres v12
84-
building extension with features `pg12`
85-
"cargo" "build" "--features" "pg12" "--no-default-features"
86-
Finished dev [unoptimized + debuginfo] target(s) in 0.07s
83+
Stopping Postgres v13
84+
building extension with features `pg13`
85+
"cargo" "build" "--features" "pg13" "--no-default-features"
86+
Finished dev [unoptimized + debuginfo] target(s) in 0.05s
8787

8888
installing extension
89-
Copying control file to `/home/username/.pgx/12.3/pgx-install/share/postgresql/extension/pgdd.control`
90-
Copying shared library to `/home/username/.pgx/12.3/pgx-install/lib/postgresql/pgdd.so`
91-
Writing extension schema to `/home/username/.pgx/12.3/pgx-install/share/postgresql/extension/pgdd--0.3.sql`
89+
Copying control file to `/home/username/.pgx/13.4/pgx-install/share/postgresql/extension/pgdd.control`
90+
Copying shared library to `/home/username/.pgx/13.4/pgx-install/lib/postgresql/pgdd.so`
91+
Building SQL generator with features `pg13`
92+
"cargo" "build" "--bin" "sql-generator" "--features" "pg13" "--no-default-features"
93+
Finished dev [unoptimized + debuginfo] target(s) in 0.05s
94+
Discovering SQL entities
95+
Discovered 9 SQL entities: 0 schemas (0 unique), 6 functions, 0 types, 0 enums, 3 sqls, 0 ords, 0 hashes
96+
running SQL generator with features `pg13`
97+
"cargo" "run" "--bin" "sql-generator" "--features" "pg13" "--no-default-features" "--" "--sql" "/home/username/.pgx/13.4/pgx-install/share/postgresql/extension/pgdd--0.4.0-dev.sql"
98+
Finished dev [unoptimized + debuginfo] target(s) in 0.06s
99+
Running `target/debug/sql-generator --sql /home/username/.pgx/13.4/pgx-install/share/postgresql/extension/pgdd--0.4.0-dev.sql`
100+
Copying extension schema file to `/home/username/.pgx/13.4/pgx-install/share/postgresql/extension/pgdd--0.3.1--0.4.0-dev.sql`
101+
Copying extension schema file to `/home/username/.pgx/13.4/pgx-install/share/postgresql/extension/pgdd--0.3--0.3.1.sql`
92102
Finished installing pgdd
93-
Starting Postgres v12 on port 28812
103+
Starting Postgres v13 on port 28813
94104
Re-using existing database pgdd
95105
```
96106

@@ -137,7 +147,7 @@ When working against Pgx installed from a non-tagged branch, install pgx using:
137147

138148
```bash
139149
cargo install --force --git "https://github.com/zombodb/pgx" \
140-
--branch "oh-no-type-resolution" \
150+
--branch "develop" \
141151
"cargo-pgx"
142152
```
143153

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ pg_test = []
1919

2020
[dependencies]
2121

22-
pgx = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
23-
pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
22+
pgx = { git = "https://github.com/zombodb/pgx", branch = "develop" }
23+
pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "develop" }
2424
#pgx = "0.1.22"
2525
#pgx-macros = "0.1.22"
2626

2727
# Won't be needed in final version (hopefully!)
28-
pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
28+
pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "develop" }
2929

3030
[dev-dependencies]
31-
pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
31+
pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "develop" }
3232
#pgx-tests = "0.1.22"
3333

3434

0 commit comments

Comments
 (0)