Merge pull request #423 from Brendonovich/scalar-type-aliases

Scalar type aliases

crates/generator/src/lib.rs

@@ -52,6 +52,7 @@ impl PrismaGenerator for Generator {
  #header
 
  pub use _prisma::*;
+ use prisma_client_rust::scalar_types::*;
 
  #enums
  },
@@ -65,6 +66,8 @@ impl PrismaGenerator for Generator {
  module.add_submodule(Module::new(
  "_prisma",
  quote! {
+ use super::*;
+
  #client
  #internal_enums
  #read_filters_module

crates/generator/src/models/mod.rs

@@ -111,7 +111,7 @@ pub fn modules(args: &GenerateArgs, module_path: &TokenStream) -> Vec<Module> {
  let mut module = Module::new(
  model.name(),
  quote! {
- use super::_prisma::*;
+ use super::{_prisma::*, *};
 
  pub const NAME: &str = #model_name;
 

crates/generator/src/read_filters.rs

@@ -73,6 +73,8 @@ pub fn generate_module(args: &GenerateArgs) -> TokenStream {
 
  quote! {
  pub mod read_filters {
+ use super::*;
+
  #(#read_filters)*
  }
  }

crates/generator/src/write_params.rs

@@ -84,6 +84,8 @@ pub fn generate_module(args: &GenerateArgs) -> TokenStream {
 
  quote! {
  pub mod write_params {
+ use super::*;
+
  #(#write_params)*
  }
  }

crates/lib/src/lib.rs

@@ -18,6 +18,7 @@ pub mod operator;
 mod prisma_value;
 pub mod queries;
 pub mod raw;
+pub mod scalar_types;
 pub mod serde;
 mod traits;
 mod transaction;

crates/lib/src/scalar_types.rs

@@ -0,0 +1,9 @@
+pub type Int = i32;
+pub type BigInt = i64;
+pub type Decimal = bigdecimal::BigDecimal;
+pub type Boolean = bool;
+pub type DateTime = chrono::DateTime<chrono::FixedOffset>;
+pub type Float = f64;
+pub type String = std::string::String;
+pub type Json = serde_json::Value;
+pub type Bytes = Vec<u8>;

crates/sdk/src/extensions.rs

@@ -225,25 +225,9 @@ pub trait ScalarTypeExt {
 
 impl ScalarTypeExt for ScalarType {
  fn to_tokens(&self) -> TokenStream {
- let pcr = quote!(::prisma_client_rust);
+ let ident = format_ident!("{}", self.as_str());
 
- match self {
- ScalarType::Int => quote!(i32),
- ScalarType::BigInt => quote!(i64),
- ScalarType::Float => quote!(f64),
- ScalarType::Decimal => quote!(#pcr::bigdecimal::BigDecimal),
- ScalarType::Boolean => quote!(bool),
- ScalarType::String => quote!(String),
- ScalarType::Json => quote!(#pcr::serde_json::Value),
- ScalarType::DateTime => {
- quote!(
- #pcr::chrono::DateTime<
- #pcr::chrono::FixedOffset,
- >
- )
- }
- ScalarType::Bytes => quote!(Vec<u8>),
- }
+ quote!(#ident)
  }
 
  fn to_prisma_value(&self, var: &Ident) -> TokenStream {