fix(postgres): sqlx prepare fails if shared_preload_libraries=pg_stat_statements #2626

mrl5 · 2023-07-17T19:01:33Z

refs:

…_statements closes launchbadge#2622 refs: * https://serde.rs/enum-representations.html#untagged * https://serde.rs/field-attrs.html#skip * https://www.postgresql.org/docs/current/pgstatstatements.html * https://www.postgresql.org/docs/current/runtime-config-statistics.html#GUC-COMPUTE-QUERY-ID

sqlx-postgres/src/connection/describe.rs

mrl5 · 2023-07-17T20:37:49Z

tests/docker-compose.yml

@@ -183,7 +183,7 @@ services:
        volumes:
            - "./postgres/setup.sql:/docker-entrypoint-initdb.d/setup.sql"
        command: >
-            -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key
+            -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c shared_preload_libraries=pg_stat_statements


I'm not sure if -c shared_preload_libraries=pg_stat_statements should be added to other postgres containers

sqlx-postgres/src/connection/describe.rs

``` error: error occurred while decoding column 0: data did not match any variant of untagged enum Explain at line 3 column 1 Error: --> tests/postgres/macros.rs:103:15 | 103 | let row = sqlx::query!(r#"CALL forty_two(null)"#) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: this error originates in the macro `$crate::sqlx_macros::expand_query` which comes from the expansion of the macro `sqlx::query` (in Nightly builds, run with -Z macro-backtrace for more info) error: could not compile `sqlx` (test "postgres-macros") due to previous error ```

valkum · 2023-07-20T11:24:53Z

It seems enabling JIT in Postgres also adds another field to the explain output. Are we able to come up with a serde data structure which can utilize #[serde(other)]. This would avoid adding fields for every possible setting/extension that adds additional fields to the QueryPlan output.

mrl5 · 2023-07-20T16:51:20Z

It seems enabling JIT in Postgres also adds another field to the explain output. Are we able to come up with a serde data structure which can utilize #[serde(other)]. This would avoid adding fields for every possible setting/extension that adds additional fields to the QueryPlan output.

hi @valkum - thanks for noticing that. Actually with this changes, sqlx will explicitly access Plan property in returned JSON. Any other property should be ignored.

So in fact even defining _query_identifier: Option<u64>, is not needed at all - I'll remove it

jplatte · 2023-07-21T06:18:53Z

sqlx-postgres/src/connection/describe.rs

    /// The string "Utility Statement" -- returned for
    /// a CALL statement
-    #[serde(rename = "Utility Statement")]
-    UtilityStatement,
+    UtilityStatement(String),


So this enum variant is never used? Its definiton was changed, but I see no other code that had to be updated because of that.

correct, that's my understanding how it was working before my changes as well. I can include "clean up" refactor to this PR

so apparently it's required for compile-time checks agains DB - to match string:

error: error occurred while decoding column 0: data did not match any variant of untagged enum Explain at line 3 column 1 Error: --> tests/postgres/macros.rs:103:15 | 103 | let row = sqlx::query!(r#"CALL forty_two(null)"#) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: this error originates in the macro `$crate::sqlx_macros::expand_query` which comes from the expansion of the macro `sqlx::query` (in Nightly builds, run with -Z macro-backtrace for more info) error: could not compile `sqlx` (test "postgres-macros") due to previous error Error: warning: build failed, waiting for other jobs to finish... Error: The process '/home/runner/.cargo/bin/cargo' failed with exit code 101

https://github.com/launchbadge/sqlx/actions/runs/5632237064/job/15260004403?pr=2626

mrl5 · 2023-07-29T20:02:00Z

pardon, @jplatte @abonander - is there anything that prevents merging this PR?

jplatte · 2023-07-29T20:03:47Z

I'm not a maintainer of sqlx, just a curious contributor 😅

mrl5 force-pushed the issue-2622 branch from 0841c6e to 8caee32 Compare July 17, 2023 19:07

This comment was marked as resolved.

Sign in to view

mrl5 force-pushed the issue-2622 branch from 8caee32 to 175ba3f Compare July 17, 2023 19:51

mrl5 commented Jul 17, 2023

View reviewed changes

sqlx-postgres/src/connection/describe.rs Outdated Show resolved Hide resolved

mrl5 force-pushed the issue-2622 branch from 175ba3f to 9ae5f4b Compare July 17, 2023 20:26

mrl5 commented Jul 17, 2023

View reviewed changes

jwangnz reviewed Jul 18, 2023

View reviewed changes

sqlx-postgres/src/connection/describe.rs Show resolved Hide resolved

mrl5 force-pushed the issue-2622 branch from 9ae5f4b to f0696ea Compare July 18, 2023 15:28

mrl5 requested a review from jwangnz July 18, 2023 15:41

jwangnz approved these changes Jul 19, 2023

View reviewed changes

valkum mentioned this pull request Jul 19, 2023

query! and query_as! macros with postgres no work #2587

Closed

refactor(postgres): don't define unused fields in QueryPlan

9102d5d

mrl5 force-pushed the issue-2622 branch from 6defc3e to 9102d5d Compare July 20, 2023 16:56

jplatte reviewed Jul 21, 2023

View reviewed changes

mrl5 force-pushed the issue-2622 branch from f460216 to 9102d5d Compare July 22, 2023 19:09

mrl5 requested a review from jplatte July 22, 2023 19:10

abonander mentioned this pull request Jul 31, 2023

fix: ignore extra fields in Postgres describe parsing #2670

Merged

abonander closed this in #2670 Jul 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(postgres): sqlx prepare fails if shared_preload_libraries=pg_stat_statements #2626

fix(postgres): sqlx prepare fails if shared_preload_libraries=pg_stat_statements #2626

mrl5 commented Jul 17, 2023 •

edited

Loading

This comment was marked as resolved.

mrl5 Jul 17, 2023 •

edited

Loading

valkum commented Jul 20, 2023

mrl5 commented Jul 20, 2023 •

edited

Loading

jplatte Jul 21, 2023

mrl5 Jul 22, 2023 •

edited

Loading

mrl5 Jul 22, 2023

mrl5 commented Jul 29, 2023

jplatte commented Jul 29, 2023

fix(postgres): sqlx prepare fails if shared_preload_libraries=pg_stat_statements #2626

fix(postgres): sqlx prepare fails if shared_preload_libraries=pg_stat_statements #2626

Conversation

mrl5 commented Jul 17, 2023 • edited Loading

This comment was marked as resolved.

mrl5 Jul 17, 2023 • edited Loading

Choose a reason for hiding this comment

valkum commented Jul 20, 2023

mrl5 commented Jul 20, 2023 • edited Loading

jplatte Jul 21, 2023

Choose a reason for hiding this comment

mrl5 Jul 22, 2023 • edited Loading

Choose a reason for hiding this comment

mrl5 Jul 22, 2023

Choose a reason for hiding this comment

mrl5 commented Jul 29, 2023

jplatte commented Jul 29, 2023

mrl5 commented Jul 17, 2023 •

edited

Loading

mrl5 Jul 17, 2023 •

edited

Loading

mrl5 commented Jul 20, 2023 •

edited

Loading

mrl5 Jul 22, 2023 •

edited

Loading