From dceb6963723cf0b5326d8fdf85981c97ff40d51b Mon Sep 17 00:00:00 2001 From: Ashton Kemerling Date: Fri, 6 Sep 2024 20:24:06 -0600 Subject: [PATCH 1/4] Add sqllogictest-rs Rust port of sqlite3 sqllogictest tool. Will be useful for verifying that relational dbs are working as expected. Only supports postgres atm, but more are being added. --- recipes/wip/db/sqllogictest/recipe.toml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 recipes/wip/db/sqllogictest/recipe.toml diff --git a/recipes/wip/db/sqllogictest/recipe.toml b/recipes/wip/db/sqllogictest/recipe.toml new file mode 100644 index 000000000..1cafcf171 --- /dev/null +++ b/recipes/wip/db/sqllogictest/recipe.toml @@ -0,0 +1,25 @@ +#TODO Works, but not reliably +#TODO Raises the following warnings. +#setsockopt(16, 6, 1, 0x7fffffff4adc, 4) - unknown option +#setsockopt(16, 1, 9, 0x7fffffff4ad0, 4) - unknown option +#setsockopt(16, 6, 1, 0x7fffffff4ad4, 4) - unknown option + + +[source] +git = "git@github.com:risinglightdb/sqllogictest-rs.git" +rev = "985748550bb8657260dac9da0fe3ebffd3cf4f28" # 0.21.0 +[build] +template = "custom" +# Necessary deviation from +script = """ +package=sqllogictest-bin +recipe="$(basename "${COOKBOOK_RECIPE}")" +"${COOKBOOK_CARGO}" build \ + --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ + --package "${package}" \ + --release +mkdir -pv "${COOKBOOK_STAGE}/usr/bin" +cp -v \ + "target/${TARGET}/release/${recipe}" \ + "${COOKBOOK_STAGE}/usr/bin/${recipe}" +""" From b87d8fd0bb2cd9758371e8d576dacb1c808db6d6 Mon Sep 17 00:00:00 2001 From: Ashton Kemerling Date: Fri, 6 Sep 2024 20:33:02 -0600 Subject: [PATCH 2/4] Use HTTPS. --- recipes/wip/db/sqllogictest/recipe.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/wip/db/sqllogictest/recipe.toml b/recipes/wip/db/sqllogictest/recipe.toml index 1cafcf171..90a6aca70 100644 --- a/recipes/wip/db/sqllogictest/recipe.toml +++ b/recipes/wip/db/sqllogictest/recipe.toml @@ -6,7 +6,7 @@ [source] -git = "git@github.com:risinglightdb/sqllogictest-rs.git" +git = "https://github.com/risinglightdb/sqllogictest-rs.git" rev = "985748550bb8657260dac9da0fe3ebffd3cf4f28" # 0.21.0 [build] template = "custom" From 9481a6210483b0bdabf4f34ce6d06207c9d4e498 Mon Sep 17 00:00:00 2001 From: Ashton Kemerling Date: Tue, 1 Jul 2025 02:03:19 +0000 Subject: [PATCH 3/4] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Ribbon --- recipes/wip/db/sqllogictest/recipe.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/wip/db/sqllogictest/recipe.toml b/recipes/wip/db/sqllogictest/recipe.toml index 90a6aca70..18c24921a 100644 --- a/recipes/wip/db/sqllogictest/recipe.toml +++ b/recipes/wip/db/sqllogictest/recipe.toml @@ -7,7 +7,6 @@ [source] git = "https://github.com/risinglightdb/sqllogictest-rs.git" -rev = "985748550bb8657260dac9da0fe3ebffd3cf4f28" # 0.21.0 [build] template = "custom" # Necessary deviation from From bab021efc9697bea10c81e7ac82f5411e37a7d24 Mon Sep 17 00:00:00 2001 From: Ashton Kemerling Date: Mon, 30 Jun 2025 20:10:38 -0600 Subject: [PATCH 4/4] Use built in cookbook_cargo_packages instead of custom script. --- recipes/wip/db/sqllogictest/recipe.toml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/recipes/wip/db/sqllogictest/recipe.toml b/recipes/wip/db/sqllogictest/recipe.toml index 18c24921a..1e47a39c5 100644 --- a/recipes/wip/db/sqllogictest/recipe.toml +++ b/recipes/wip/db/sqllogictest/recipe.toml @@ -9,16 +9,6 @@ git = "https://github.com/risinglightdb/sqllogictest-rs.git" [build] template = "custom" -# Necessary deviation from script = """ -package=sqllogictest-bin -recipe="$(basename "${COOKBOOK_RECIPE}")" -"${COOKBOOK_CARGO}" build \ - --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ - --package "${package}" \ - --release -mkdir -pv "${COOKBOOK_STAGE}/usr/bin" -cp -v \ - "target/${TARGET}/release/${recipe}" \ - "${COOKBOOK_STAGE}/usr/bin/${recipe}" +cookbook_cargo_packages sqllogictest-bin """