New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(cube): support postgres cube #3188

Merged

abonander merged 52 commits into launchbadge:main from jayy-lmao:feat/cube

Jul 12, 2024

Contributor

jayy-lmao commented Apr 9, 2024

I work on a sqlx codegen tool, and had an issue posted about the lack of support for the 'cube' extension type (https://www.postgresql.org/docs/current/cube.html).

jayy-lmao/sql-gen#9

I could not see any outstanding issues / PRs involving Cube, so can create an issue first if necessary for discussion.
Not particularly attached to how to structure the struct, serialisation, or deserialisation - ultimately just want to be able to support it for my sql-gen tool so that @yellowHatpro can carry on with using it for their project.

Contributor Author

jayy-lmao commented Apr 9, 2024 •

edited

Loading

Sorry for the build jobs -- running locally the encoding seems to be fine.
Haven't been able to replicate locally with amd64 platform, alpine etc. Still figuring out why the encoding is different.

Update: have been able to reproduce by using

    let row = s.try_next().await?.unwrap();
    let rec = row.try_get::<PgCube, _>(0)?;

Locally to test. Will continue to investigate.

abonander reviewed

View reviewed changes

README.md Outdated Show resolved Hide resolved

abonander reviewed

View reviewed changes

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

Contributor Author

jayy-lmao commented Apr 12, 2024

Have handled the text case, tests now passing ☺️

jayy-lmao requested a review from abonander

April 15, 2024 06:33

abonander requested changes

View reviewed changes

sqlx-postgres/src/type_checking.rs Outdated Show resolved Hide resolved

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

jayy-lmao requested a review from abonander

April 17, 2024 12:08

Contributor Author

jayy-lmao commented Apr 21, 2024

Have made the changes to vector indexing :)

abonander reviewed

View reviewed changes

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

abonander reviewed

View reviewed changes

sqlx-postgres/src/types/cube.rs Outdated

+                  }
+              }
+              impl TryFrom<&str> for PgCube {

Collaborator

abonander Apr 22, 2024

This should be a FromStr impl.

It's fine to have both, but it's surprising to have a TryFrom<&str> impl and not a FromStr impl.

The only reason to do that is if Self wants to borrow from the string (think zero-copy parsing) which the FromStr trait doesn't support due to its lack of a lifetime bound.

abonander reviewed

View reviewed changes

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

abonander reviewed

View reviewed changes

sqlx-postgres/src/types/cube.rs Outdated Show resolved Hide resolved

abonander reviewed

View reviewed changes

sqlx-postgres/src/types/cube.rs Show resolved Hide resolved

Contributor Author

jayy-lmao commented Apr 24, 2024 •

edited

Loading

Have made changes

trimming the input string to make it more flexible for the spec & for user input
allow for _cube array type (And included a test for it)
remove TryFrom behaviour for &[u8], using direct function instead
avoid double creating a buffer, but just writing directly to the PgArgumentBuffer

jayy-lmao requested a review from abonander

April 24, 2024 23:41

Contributor Author

jayy-lmao commented May 15, 2024

Apologies, I've been away for a little - I've addressed all comments but if there's any other changes that are wanted let me know

abonander requested changes

View reviewed changes

Collaborator

abonander left a comment

@jayy-lmao one last thing, since #3126 was merged, you'll need to rebase and fix the compilation errors.

Collaborator

abonander commented Jun 6, 2024

Note that I only today realized that main has been broken for the past few weeks and I'm still working on fixing Clippy warnings (turned into errors by CI) from that.

Don't worry about fixing errors in code you didn't touch.

jayy-lmao force-pushed the feat/cube branch from 7d130a0 to 480f986 Compare

June 6, 2024 08:31

Contributor Author

jayy-lmao commented Jun 6, 2024 •

edited

Loading

Note that I only today realized that main has been broken for the past few weeks and I'm still working on fixing Clippy warnings (turned into errors by CI) from that.

Don't worry about fixing errors in code you didn't touch.

Just saw this then.

Oh well, at least I've resolved the changes in Encode implementation.
Glad it supports returning errors now ☺️

Let me know if I can be any help with the errors.

jayy-lmao added 10 commits

July 9, 2024 21:51


          feat: add cube

7aee197


          docs: cube docs

b0e574a


          docs: update readme


          fix: cube is now not feature flagged

ac9e107


          fix: formatting

1e15aab


          fix: typeo for PgCube vs Cube

44e3174


          fix: correct types

83fedd2


          fix: postgres only types for cube

33f909b


          fix: cube readme

f1c9ee7


          fix: dont unwrap cubes

c22e8f5

jayy-lmao added 23 commits

July 9, 2024 21:51


          fix: flags

b892ad7


          fix: avoid redundant buffer creation and use FromStr trait

925584e


          fix: handle serializing

2a03776


          test: cube vec test

97120f1


          fix: no array cube test

4aee91a


          fix: update test with array for cube

7d2497d


          fix: dont use try from for u8

d212efe


          fix: conditionally remove padding

79ad49a


          fix: conditional trimming

fff6e0e


          fix: idiomatic trimming

7d13776


          fix: linting

eb6751d


          fix: remove whitespace

90fa31f


          fix: lower case array

969dd0c


          fix: spacing input

8cc5693


          test: one more vec test

c0d7976


          fix: trim square brackets in case they are using postgres spec page

5207af4


          fix: result types

2241d4a


          fix: format

3a44033


          fix: box error

95da2fa


          fix: the borrow produces a value

a7463cc


          fix: self serialise

683c05f


          chore: merge main

9e193e5


          fix: borrow

1e73ab5

jayy-lmao force-pushed the feat/cube branch from 3fe5c89 to 1e73ab5 Compare

July 9, 2024 11:52


          fix: clippy

cd0455e

Contributor Author

jayy-lmao commented Jul 9, 2024

@abonander have rebased onto main now that builds are passing, and updated to address new linting rules 👍

jayy-lmao requested a review from abonander

July 10, 2024 06:22

abonander merged commit 0db12a9 into launchbadge:main

64 checks passed

jrasanen pushed a commit to jrasanen/sqlx that referenced this pull request


          feat(cube): support postgres cube (launchbadge#3188)

0f85658

* feat: add cube

* docs: cube docs

* docs: update readme

* fix: cube is now not feature flagged

* fix: formatting

* fix: typeo for PgCube vs Cube

* fix: correct types

* fix: postgres only types for cube

* fix: cube readme

* fix: dont unwrap cubes

* fix: typo on interval

* fix: zero volume cube array

* fix: return type

* fix: update tests

* fix: run with one test type

* fix: log bytes in error

* fix: typo in test

* fix: log bytes for failed length

* fix: string deser

* docs: remove cube from readme

* fix: int to float

* fix: trim floats

* fix: exttra test

* fix: type safe into vectors

* fix: improve error messages

* docs: remove comments

* fix: front load most important logic and const at start

* fix: extract constants

* fix: flags

* fix: avoid redundant buffer creation and use FromStr trait

* fix: handle serializing

* test: cube vec test

* fix: no array cube test

* fix: update test with array for cube

* fix: dont use try from for u8

* fix: conditionally remove padding

* fix: conditional trimming

* fix: idiomatic trimming

* fix: linting

* fix: remove whitespace

* fix: lower case array

* fix: spacing input

* test: one more vec test

* fix: trim square brackets in case they are using postgres spec page

* fix: result types

* fix: format

* fix: box error

* fix: the borrow produces a value

* fix: self serialise

* chore: merge main

* fix: borrow

* fix: clippy

---------

Co-authored-by: James Holman <[email protected]>

jrasanen pushed a commit to jrasanen/sqlx that referenced this pull request


          feat(cube): support postgres cube (launchbadge#3188)

4c02444

* feat: add cube

* docs: cube docs

* docs: update readme

* fix: cube is now not feature flagged

* fix: formatting

* fix: typeo for PgCube vs Cube

* fix: correct types

* fix: postgres only types for cube

* fix: cube readme

* fix: dont unwrap cubes

* fix: typo on interval

* fix: zero volume cube array

* fix: return type

* fix: update tests

* fix: run with one test type

* fix: log bytes in error

* fix: typo in test

* fix: log bytes for failed length

* fix: string deser

* docs: remove cube from readme

* fix: int to float

* fix: trim floats

* fix: exttra test

* fix: type safe into vectors

* fix: improve error messages

* docs: remove comments

* fix: front load most important logic and const at start

* fix: extract constants

* fix: flags

* fix: avoid redundant buffer creation and use FromStr trait

* fix: handle serializing

* test: cube vec test

* fix: no array cube test

* fix: update test with array for cube

* fix: dont use try from for u8

* fix: conditionally remove padding

* fix: conditional trimming

* fix: idiomatic trimming

* fix: linting

* fix: remove whitespace

* fix: lower case array

* fix: spacing input

* test: one more vec test

* fix: trim square brackets in case they are using postgres spec page

* fix: result types

* fix: format

* fix: box error

* fix: the borrow produces a value

* fix: self serialise

* chore: merge main

* fix: borrow

* fix: clippy

---------

Co-authored-by: James Holman <[email protected]>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet