Update instructions for dev to follow pgx. Add newly generated files with latest branch. Back to functional against current pgx development.

Author: rustprooflabs

.cargo/config

@@ -1,3 +1,13 @@
-[build]
-# Postgres symbols won't ve available until runtime
-rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
+# Auto-generated by pgx. You may edit this, or delete it to have a new one created.
+
+[target.x86_64-unknown-linux-gnu]
+linker = "./.cargo/pgx-linker-script.sh"
+
+[target.aarch64-unknown-linux-gnu]
+linker = "./.cargo/pgx-linker-script.sh"
+
+[target.x86_64-apple-darwin]
+linker = "./.cargo/pgx-linker-script.sh"
+
+[target.aarch64-apple-darwin]
+linker = "./.cargo/pgx-linker-script.sh"

.cargo/linker-script.sh

@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+# Auto-generated by pgx. You may edit this, or delete it to have a new one created.
+
+if [[ $CARGO_BIN_NAME == "sql-generator" ]]; then
+    gcc -Wl,-undefined,dynamic_lookup,-dynamic-list=$CARGO_MANIFEST_DIR/.cargo/pgx-dynamic-list.txt $@
+else 
+    gcc -Wl,-undefined,dynamic_lookup $@
+fi

.cargo/pgx-dynamic-list.txt

@@ -0,0 +1 @@
+{ __pgx_internals_*; };

.cargo/pgx-linker-script.sh

@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+# Auto-generated by pgx. You may edit this, or delete it to have a new one created.
+
+if [[ $CARGO_BIN_NAME == "sql-generator" ]]; then
+    gcc -Wl,-undefined,dynamic_lookup,-dynamic-list=$CARGO_MANIFEST_DIR/.cargo/pgx-dynamic-list.txt $@
+else 
+    gcc -Wl,-undefined,dynamic_lookup $@
+fi

ADVANCED-INSTALL.md

@@ -32,21 +32,13 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y
 source $HOME/.cargo/env
 ```
 
-Install `cargo-pgx` regularly.
+Install `cargo-pgx` regularly (see dev steps below for non-standard install).
 
 
 ```bash
 cargo install cargo-pgx
 ```
 
-ALTERNATIVE for development -- Install specific branch from Pgx repo:
-
-```bash
-cargo install --force --git "https://github.com/zombodb/pgx" \
-    --branch "oh-no-type-resolution" \
-    "cargo-pgx"
-```
-
 
 Install `cargo-deb` used for packaging binaries.
 
@@ -80,7 +72,7 @@ changes the last two digits of the port!
 
 
 ```bash
-cargo pgx run pg12
+cargo pgx run pg13
 ```
 
 Example output.
@@ -135,3 +127,52 @@ dot -Goverlap=prism -Gspline=ortho -Tjpg extension.dot > extension.jpg
 ```
 
 ![pgx dependencies for pgdd v0.4.0-dev](pgdd--0.4.0-dev.jpg)
+
+
+## Non-standard dev
+
+When working against Pgx installed from a non-tagged branch, install pgx using:
+
+```bash
+cargo install --force --git "https://github.com/zombodb/pgx" \
+    --branch "oh-no-type-resolution" \
+    "cargo-pgx"
+```
+
+Changes to `Cargo.toml` required in `[lib]` and `[dependencies]` sections.
+
+
+```toml
+[lib]
+# rlib added to build against repo instead of crate (I think)
+crate-type = ["cdylib", "rlib"]
+#crate-type = ["cdylib"]
+```
+
+
+```toml
+[dependencies]
+
+pgx = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
+pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
+#pgx = "0.1.21"
+#pgx-macros = "0.1.21"
+
+# Won't be needed in final version (hopefully!)
+pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
+
+[dev-dependencies]
+pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
+#pgx-tests = "0.1.21"
+```
+
+
+
+The following command can be used to force pgx to overwrite the configs it needs to
+for various dev related changes.
+
+
+```bash
+cargo pgx schema -f
+```
+ 

Cargo.toml

@@ -21,15 +21,15 @@ pg_test = []
 
 pgx = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
 pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
-#pgx = "0.1.21"
-#pgx-macros = "0.1.21"
+#pgx = "0.1.22"
+#pgx-macros = "0.1.22"
 
 # Won't be needed in final version (hopefully!)
 pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
 
 [dev-dependencies]
 pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
-#pgx-tests = "0.1.21"
+#pgx-tests = "0.1.22"
 
 
 [profile.dev]