Merge remote-tracking branch 'origin/ab/bigdecimal'

Author: mehcode

.github/workflows/rust.yml

@@ -39,25 +39,25 @@ jobs:
 
  # check w/deny warnings in sqlx-core: async-std
  - working-directory: sqlx-core
- run: cargo rustc --no-default-features --features 'chrono uuid postgres mysql tls runtime-async-std' -- -D warnings --emit=metadata
+ run: cargo rustc --no-default-features --features 'bigdecimal_bigint chrono uuid postgres mysql tls runtime-async-std' -- -D warnings --emit=metadata
 
  # check w/deny warnings in sqlx-core: tokio
  # `cargo rustc -p sqlx-core` ignores `--no-default-features` and builds with `runtime-async-std` anyway
  # https://github.com/rust-lang/cargo/issues/5364
  - working-directory: sqlx-core
- run: cargo rustc --no-default-features --features 'chrono uuid postgres mysql tls runtime-tokio' -- -D warnings --emit=metadata
+ run: cargo rustc --no-default-features --features 'bigdecimal_bigint chrono uuid postgres mysql tls runtime-tokio' -- -D warnings --emit=metadata
 
  # check w/deny warnings: async-std
- - run: cargo rustc --no-default-features --features 'chrono uuid postgres mysql macros tls runtime-async-std' -- -D warnings --emit=metadata
+ - run: cargo rustc --no-default-features --features 'bigdecimal chrono uuid postgres mysql macros tls runtime-async-std' -- -D warnings --emit=metadata
 
  # check w/deny warnings: tokio
- - run: cargo rustc --no-default-features --features 'chrono uuid postgres mysql macros tls runtime-tokio' -- -D warnings --emit=metadata
+ - run: cargo rustc --no-default-features --features 'bigdecimal chrono uuid postgres mysql macros tls runtime-tokio' -- -D warnings --emit=metadata
 
  # unit test: async-std
- - run: cargo test --manifest-path sqlx-core/Cargo.toml --no-default-features --features 'chrono uuid postgres mysql tls runtime-async-std'
+ - run: cargo test --manifest-path sqlx-core/Cargo.toml --no-default-features --features 'bigdecimal chrono uuid postgres mysql tls runtime-async-std'
 
  # unit test: tokio
- - run: cargo test --manifest-path sqlx-core/Cargo.toml --no-default-features --features 'chrono uuid postgres mysql tls runtime-tokio'
+ - run: cargo test --manifest-path sqlx-core/Cargo.toml --no-default-features --features 'bigdecimal chrono uuid postgres mysql tls runtime-tokio'
 
  # integration test: sqlite + async-std
  - run: cargo test --no-default-features --features 'runtime-async-std sqlite macros uuid chrono tls'
@@ -121,22 +121,22 @@ jobs:
  # -----------------------------------------------------
 
  # integration test: async-std
- - run: cargo test --no-default-features --features 'runtime-async-std postgres macros uuid chrono tls'
+ - run: cargo test --no-default-features --features 'runtime-async-std postgres macros uuid chrono bigdecimal tls'
  env:
  DATABASE_URL: postgres://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/postgres
 
  # integration test: tokio
- - run: cargo test --no-default-features --features 'runtime-tokio postgres macros uuid chrono tls'
+ - run: cargo test --no-default-features --features 'runtime-tokio postgres macros uuid chrono bigdecimal tls'
  env:
  DATABASE_URL: postgres://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/postgres
 
  # UI feature gate tests: async-std
- - run: cargo test --no-default-features --features 'runtime-async-std postgres macros tls'
+ - run: cargo test --no-default-features --features 'runtime-async-std postgres macros bigdecimal tls'
  env:
  DATABASE_URL: postgres://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/postgres
 
  # UI feature gate tests: tokio
- - run: cargo test --no-default-features --features 'runtime-tokio postgres macros tls'
+ - run: cargo test --no-default-features --features 'runtime-tokio postgres macros bigdecimal tls'
  env:
  DATABASE_URL: postgres://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/postgres
 

Cargo.lock

@@ -46,6 +46,7 @@ mysql = [ "sqlx-core/mysql", "sqlx-macros/mysql" ]
 sqlite = [ "sqlx-core/sqlite", "sqlx-macros/sqlite" ]
 
 # types
+bigdecimal = ["sqlx-core/bigdecimal_bigint", "sqlx-macros/bigdecimal"]
 chrono = [ "sqlx-core/chrono", "sqlx-macros/chrono" ]
 uuid = [ "sqlx-core/uuid", "sqlx-macros/uuid" ]
 

Cargo.toml

@@ -15,6 +15,9 @@ authors = [
 [features]
 default = [ "runtime-async-std" ]
 unstable = []
+# we need a feature which activates `num-bigint` as well because
+# `bigdecimal` uses types from it but does not reexport (tsk tsk)
+bigdecimal_bigint = ["bigdecimal", "num-bigint"]
 postgres = [ "md-5", "sha2", "base64", "sha-1", "rand", "hmac", "futures-channel/sink", "futures-util/sink" ]
 mysql = [ "sha-1", "sha2", "generic-array", "num-bigint", "base64", "digest", "rand" ]
 sqlite = [ "libsqlite3-sys" ]
@@ -27,6 +30,7 @@ async-native-tls = { version = "0.3.2", default-features = false, optional = tru
 async-std = { version = "1.5.0", features = [ "unstable" ], optional = true }
 async-stream = { version = "0.2.1", default-features = false }
 base64 = { version = "0.12.0", default-features = false, optional = true, features = [ "std" ] }
+bigdecimal = { version = "0.1.0", optional = true }
 bitflags = { version = "1.2.1", default-features = false }
 byteorder = { version = "1.3.4", default-features = false, features = [ "std" ] }
 chrono = { version = "0.4.10", default-features = false, features = [ "clock" ], optional = true }

sqlx-core/Cargo.toml

@@ -1,6 +1,12 @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct TypeId(pub(crate) u32);
 
+// DEVELOPER PRO TIP: find builtin type OIDs easily by grepping this file
+// https://github.com/postgres/postgres/blob/master/src/include/catalog/pg_type.dat
+//
+// If you have Postgres running locally you can also try
+// SELECT oid, typarray FROM pg_type where typname = '<type name>'
+
 #[allow(dead_code)]
 impl TypeId {
  // Scalar
@@ -14,6 +20,8 @@ impl TypeId {
  pub(crate) const FLOAT4: TypeId = TypeId(700);
  pub(crate) const FLOAT8: TypeId = TypeId(701);
 
+ pub(crate) const NUMERIC: TypeId = TypeId(1700);
+
  pub(crate) const TEXT: TypeId = TypeId(25);
 
  pub(crate) const DATE: TypeId = TypeId(1082);
@@ -38,6 +46,8 @@ impl TypeId {
 
  pub(crate) const ARRAY_TEXT: TypeId = TypeId(1009);
 
+ pub(crate) const ARRAY_NUMERIC: TypeId = TypeId(1700);
+
  pub(crate) const ARRAY_DATE: TypeId = TypeId(1182);
  pub(crate) const ARRAY_TIME: TypeId = TypeId(1183);
  pub(crate) const ARRAY_TIMESTAMP: TypeId = TypeId(1115);