Test reorg

.github/workflows/ci.yml

@@ -148,13 +148,29 @@ jobs:
     - name: Run cargo pgrx init
       run: cargo pgrx init --pg$PG_VER $(which pg_config)
 
-    - name: Test PL/rust as "untrusted"
-      if: matrix.target == 'host'
-      run: cargo test --all --features "pg$PG_VER" --no-default-features
+    - name: Install PL/Rust as "trusted"
+      if: matrix.target == 'postgrestd'
+      run: cd plrust && STD_TARGETS="aarch64-postgres-linux-gnu" ./build && echo "\q" | cargo pgrx run "pg$PG_VER" --features "trusted"
+
+    - name: Test PL/Rust package as "trusted"
+      if: matrix.target == 'postgrestd'
+      run: cd plrust && cargo test --no-default-features --features "pg$PG_VER trusted"
 
-    - name: Test PL/rust as "trusted" (inc. postgrestd)
+    - name: Run PL/Rust integration tests as "trusted"
       if: matrix.target == 'postgrestd'
-      run: cd plrust && STD_TARGETS="aarch64-postgres-linux-gnu" ./build && cargo test --verbose --no-default-features --features "pg$PG_VER trusted"
+      run: cd plrust && echo "\q" | cargo pgrx run "pg$PG_VER" --features "trusted" && cd ../plrust-tests && cargo test --no-default-features --features "pg$PG_VER trusted"
+
+    - name: Install PL/Rust as "untrusted"
+      if: matrix.target == 'host'
+      run: cd plrust && STD_TARGETS="aarch64-postgres-linux-gnu" ./build && echo "\q" | cargo pgrx run "pg$PG_VER"
+
+    - name: Test PL/Rust package as "untrusted"
+      if: matrix.target == 'host'
+      run: cd plrust && cargo test --no-default-features --features "pg$PG_VER"
+
+    - name: Run PL/Rust integration tests as "untrusted"
+      if: matrix.target == 'host'
+      run: cd plrust && echo "\q" | cargo pgrx run "pg$PG_VER" && cd ../plrust-tests && cargo test --no-default-features --features "pg$PG_VER"
 
     - name: Print sccache stats (after build)
       run: sccache --show-stats
@@ -315,6 +331,9 @@ jobs:
     - name: Print sccache stats
       run: sccache --show-stats
 
+    - name: Test plrustc
+      run: cd plrustc && cargo test
+
     - name: Install plrustc
       run: cd plrustc && ./build.sh && cp ../build/bin/plrustc ~/.cargo/bin
 
@@ -324,13 +343,29 @@ jobs:
     - name: Run 'cargo pgrx init' against system-level ${{ matrix.version }}
       run: cargo pgrx init --pg$PG_VER $(which pg_config)
 
-    - name: Test PL/rust as "untrusted"
-      if: matrix.target == 'host'
-      run: cargo test --all --features "pg$PG_VER" --no-default-features
+    - name: Install PL/Rust as "trusted"
+      if: matrix.target == 'postgrestd'
+      run: cd plrust && STD_TARGETS="x86_64-postgres-linux-gnu" ./build && echo "\q" | cargo pgrx run "pg$PG_VER" --features "trusted"
 
-    - name: Test PL/rust as "trusted" (inc. postgrestd)
+    - name: Test PL/Rust package as "trusted"
       if: matrix.target == 'postgrestd'
-      run: cd plrust && STD_TARGETS="x86_64-postgres-linux-gnu" ./build && cargo test --verbose --no-default-features --features "pg$PG_VER trusted"
+      run: cd plrust && cargo test --no-default-features --features "pg$PG_VER trusted"
+
+    - name: Run PL/Rust integration tests as "trusted"
+      if: matrix.target == 'postgrestd'
+      run: cd plrust && echo "\q" | cargo pgrx run "pg$PG_VER" --features "trusted" && cd ../plrust-tests && cargo test --no-default-features --features "pg$PG_VER trusted"
+
+    - name: Install PL/Rust as "untrusted"
+      if: matrix.target == 'host'
+      run: cd plrust && STD_TARGETS="x86_64-postgres-linux-gnu" ./build && echo "\q" | cargo pgrx run "pg$PG_VER"
+
+    - name: Test PL/Rust package as "untrusted"
+      if: matrix.target == 'host'
+      run: cd plrust && cargo test --no-default-features --features "pg$PG_VER"
+
+    - name: Run PL/Rust integration tests as "untrusted"
+      if: matrix.target == 'host'
+      run: cd plrust && echo "\q" | cargo pgrx run "pg$PG_VER" && cd ../plrust-tests && cargo test --no-default-features --features "pg$PG_VER"
 
     - name: Print sccache stats
       run: sccache --show-stats

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 members = [
     "plrust",
     "plrust-trusted-pgrx",
+    "plrust-tests",    
 ]
 exclude = ["plrustc"]#, "builder"]
 

plrust-tests/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "plrust-tests"
+version = "0.0.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[features]
+default = ["pg13"]
+pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
+pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
+pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
+pg_test = []
+trusted = []
+
+[dependencies]
+pgrx = "=0.9.7"
+tempfile = "3.8.0"
+once_cell = "1.18.0"
+
+[dev-dependencies]
+pgrx-tests = "=0.9.7"
+tempfile = "3.8.0"
+once_cell = "1.18.0"

plrust-tests/plrust_tests.control

@@ -0,0 +1,6 @@
+comment = 'plrust_tests:  Created by pgrx'
+default_version = '@CARGO_VERSION@'
+module_pathname = '$libdir/plrust_tests'
+relocatable = false
+superuser = true
+requires = 'plrust'

plrust-tests/run-tests.sh

@@ -0,0 +1,30 @@
+#! /bin/bash
+
+VERSION=$1
+
+if [ -z ${VERSION} ]; then
+	echo "usage:  ./run-tests.sh pgXX [test-name]"
+	exit 1
+fi
+
+TEST_DIR=`pwd`
+
+set -e
+
+# install the plrust extension into the pgrx-managed postgres
+echo "============================"
+echo " installing plrust"
+echo
+cd ../plrust
+echo "\q" | cargo pgrx run ${VERSION}
+
+# run the test suite from this crate
+cd ${TEST_DIR}
+
+echo
+echo "============================"
+echo " running plrust-tests suite"
+echo
+
+cargo pgrx test ${VERSION} $2
+

plrust-tests/src/alter.rs

@@ -0,0 +1,42 @@
+/*
+Portions Copyright 2020-2021 ZomboDB, LLC.
+Portions Copyright 2021-2023 Technology Concepts & Design, Inc. <[email protected]>
+
+All rights reserved.
+
+Use of this source code is governed by the PostgreSQL license that can be found in the LICENSE.md file.
+*/
+
+#[cfg(any(test, feature = "pg_test"))]
+#[pgrx::pg_schema]
+mod tests {
+    use pgrx::prelude::*;
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic = "plrust functions cannot have their STRICT property altered"]
+    fn plrust_cant_change_strict_off() -> spi::Result<()> {
+        let definition = r#"
+            CREATE FUNCTION cant_change_strict_off()
+            RETURNS int
+            LANGUAGE plrust
+            AS $$ Ok(Some(1)) $$;
+        "#;
+        Spi::run(definition)?;
+        Spi::run("ALTER FUNCTION cant_change_strict_off() CALLED ON NULL INPUT")
+    }
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic = "plrust functions cannot have their STRICT property altered"]
+    fn plrust_cant_change_strict_on() -> spi::Result<()> {
+        let definition = r#"
+            CREATE FUNCTION cant_change_strict_on()
+            RETURNS int
+            LANGUAGE plrust
+            AS $$ Ok(Some(1)) $$;
+        "#;
+        Spi::run(definition)?;
+        Spi::run("ALTER FUNCTION cant_change_strict_on() RETURNS NULL ON NULL INPUT")
+    }
+}

plrust-tests/src/argument.rs

@@ -0,0 +1,71 @@
+/*
+Portions Copyright 2020-2021 ZomboDB, LLC.
+Portions Copyright 2021-2023 Technology Concepts & Design, Inc. <[email protected]>
+
+All rights reserved.
+
+Use of this source code is governed by the PostgreSQL license that can be found in the LICENSE.md file.
+*/
+
+#[cfg(any(test, feature = "pg_test"))]
+#[pgrx::pg_schema]
+mod tests {
+    use pgrx::prelude::*;
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic = "parameter name \"a\" used more than once"]
+    fn plrust_dup_args() -> spi::Result<()> {
+        let definition = r#"
+            CREATE FUNCTION not_unique(a int, a int)
+            RETURNS int AS
+            $$
+                Ok(a)
+            $$ LANGUAGE plrust;
+        "#;
+        Spi::run(definition)?;
+        let result = Spi::get_one::<i32>("SELECT not_unique(1, 2);\n");
+        assert_eq!(Ok(Some(1)), result);
+        Ok(())
+    }
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic = "PL/Rust does not support unnamed arguments"]
+    fn plrust_defaulting_dup_args() -> spi::Result<()> {
+        let definition = r#"
+            CREATE FUNCTION not_unique(int, arg0 int)
+            RETURNS int AS
+            $$
+                Ok(arg0)
+            $$ LANGUAGE plrust;
+        "#;
+        Spi::run(definition)?;
+        let result = Spi::get_one::<i32>("SELECT not_unique(1, 2);\n");
+        assert_eq!(Ok(Some(1)), result);
+        Ok(())
+    }
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic(expected = "PL/Rust does not support unnamed arguments")]
+    fn unnamed_args() -> spi::Result<()> {
+        Spi::run("CREATE FUNCTION unnamed_arg(int) RETURNS int LANGUAGE plrust as $$ Ok(None) $$;")
+    }
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic(expected = "PL/Rust does not support unnamed arguments")]
+    fn named_unnamed_args() -> spi::Result<()> {
+        Spi::run("CREATE FUNCTION named_unnamed_arg(bob text, int) RETURNS int LANGUAGE plrust as $$ Ok(None) $$;")
+    }
+
+    #[pg_test]
+    #[search_path(@extschema@)]
+    #[should_panic(
+        expected = "is an invalid Rust identifier and cannot be used as an argument name"
+    )]
+    fn invalid_arg_identifier() -> spi::Result<()> {
+        Spi::run("CREATE FUNCTION invalid_arg_identifier(\"this isn't a valid rust identifier\" int) RETURNS int LANGUAGE plrust as $$ Ok(None) $$;")
+    }
+}