Revert "fix: validate integers to prevent overflow (#3231)" (#3237)

prisma · Sep 27, 2022 · f352a33 · f352a33
1 parent 5a6e984
commit f352a33
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 907 deletions.
diff --git a/psl/builtin-connectors/src/cockroach_datamodel_connector.rs b/psl/builtin-connectors/src/cockroach_datamodel_connector.rs
@@ -6,7 +6,6 @@ use native_types::{CockroachType, NativeType};
 use psl_core::{
     datamodel_connector::{
         helper::{arg_vec_from_opt, args_vec_from_opt, parse_one_opt_u32, parse_two_opt_u32},
-        int_type::IntType,
         Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
         ReferentialIntegrity, StringFilter,
     },
@@ -157,7 +156,7 @@ impl Connector for CockroachDatamodelConnector {
             // Int
             CockroachType::Int2 => ScalarType::Int,
             CockroachType::Int4 => ScalarType::Int,
-            CockroachType::Oid => ScalarType::Int, // Unsigned 32-bit int
+            CockroachType::Oid => ScalarType::Int,
             // BigInt
             CockroachType::Int8 => ScalarType::BigInt,
             // Float
@@ -380,17 +379,6 @@ impl Connector for CockroachDatamodelConnector {
             }
         }
     }
-
-    fn int_type(&self, native_type: serde_json::Value) -> Option<IntType> {
-        let nt: CockroachType = serde_json::from_value(native_type).unwrap();
-
-        match nt {
-            CockroachType::Int2 => Some(IntType::Signed16),
-            CockroachType::Int4 => Some(IntType::Signed32),
-            CockroachType::Oid => Some(IntType::Unsigned32),
-            _ => None,
-        }
-    }
 }
 
 /// An `@default(sequence())` function.

diff --git a/psl/builtin-connectors/src/mongodb.rs b/psl/builtin-connectors/src/mongodb.rs
@@ -6,7 +6,7 @@ use mongodb_types::*;
 use native_types::{MongoDbType, NativeType};
 use psl_core::{
     datamodel_connector::{
-        int_type::IntType, Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
+        Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
         ReferentialIntegrity,
     },
     diagnostics::{DatamodelError, Diagnostics, Span},
@@ -132,13 +132,4 @@ impl Connector for MongoDbDatamodelConnector {
     fn allowed_referential_integrity_settings(&self) -> enumflags2::BitFlags<ReferentialIntegrity> {
         ReferentialIntegrity::Prisma.into()
     }
-
-    fn int_type(&self, native_type: serde_json::Value) -> Option<IntType> {
-        let nt: MongoDbType = serde_json::from_value(native_type).unwrap();
-
-        match nt {
-            MongoDbType::Int => Some(IntType::Signed32),
-            _ => None,
-        }
-    }
 }
diff --git a/psl/builtin-connectors/src/mssql_datamodel_connector.rs b/psl/builtin-connectors/src/mssql_datamodel_connector.rs
@@ -8,7 +8,6 @@ use once_cell::sync::Lazy;
 use psl_core::{
     datamodel_connector::{
         helper::{arg_vec_from_opt, args_vec_from_opt, parse_one_opt_u32, parse_two_opt_u32},
-        int_type::IntType,
         Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
         ReferentialIntegrity,
     },
@@ -439,17 +438,6 @@ impl Connector for MsSqlDatamodelConnector {
             });
         }
     }
-
-    fn int_type(&self, native_type: serde_json::Value) -> Option<IntType> {
-        let nt: MsSqlType = serde_json::from_value(native_type).unwrap();
-
-        match nt {
-            TinyInt => Some(IntType::Unsigned8),
-            SmallInt => Some(IntType::Signed16),
-            Int => Some(IntType::Signed32),
-            _ => None,
-        }
-    }
 }
 
 /// A collection of types stored outside of the row to the heap, having

diff --git a/psl/builtin-connectors/src/mysql_datamodel_connector.rs b/psl/builtin-connectors/src/mysql_datamodel_connector.rs
@@ -8,7 +8,6 @@ use native_types::{
 use psl_core::{
     datamodel_connector::{
         helper::{args_vec_from_opt, parse_one_opt_u32, parse_one_u32, parse_two_opt_u32},
-        int_type::IntType,
         Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
         ReferentialIntegrity,
     },
@@ -406,22 +405,4 @@ impl Connector for MySqlDatamodelConnector {
 
         Ok(())
     }
-
-    fn int_type(&self, native_type: serde_json::Value) -> Option<IntType> {
-        let nt: MySqlType = serde_json::from_value(native_type).unwrap();
-
-        match nt {
-            MySqlType::TinyInt => Some(IntType::Signed8),
-            MySqlType::SmallInt => Some(IntType::Signed16),
-            MySqlType::MediumInt => Some(IntType::Signed24),
-            MySqlType::Int => Some(IntType::Signed32),
-            MySqlType::UnsignedTinyInt => Some(IntType::Unsigned8),
-            MySqlType::UnsignedSmallInt => Some(IntType::Unsigned16),
-            MySqlType::UnsignedMediumInt => Some(IntType::Unsigned24),
-            MySqlType::UnsignedInt => Some(IntType::Unsigned32),
-            // Technically stored as an Unsigned8 but with values ranging from 1901 and 2155
-            MySqlType::Year => Some(IntType::Custom(1901, 2155)),
-            _ => None,
-        }
-    }
 }
diff --git a/psl/builtin-connectors/src/postgres_datamodel_connector.rs b/psl/builtin-connectors/src/postgres_datamodel_connector.rs
@@ -9,7 +9,6 @@ use native_types::{
 use psl_core::{
     datamodel_connector::{
         helper::{arg_vec_from_opt, args_vec_from_opt, parse_one_opt_u32, parse_two_opt_u32},
-        int_type::IntType,
         Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
         ReferentialIntegrity, StringFilter,
     },
@@ -180,7 +179,6 @@ impl Connector for PostgresDatamodelConnector {
             //Int
             SmallInt => ScalarType::Int,
             Integer => ScalarType::Int,
-            // Unsigned 32-bit int
             Oid => ScalarType::Int,
             //BigInt
             BigInt => ScalarType::BigInt,
@@ -454,17 +452,6 @@ impl Connector for PostgresDatamodelConnector {
             _ => (),
         }
     }
-
-    fn int_type(&self, native_type: serde_json::Value) -> Option<IntType> {
-        let nt: PostgresType = serde_json::from_value(native_type).unwrap();
-
-        match nt {
-            SmallInt => Some(IntType::Signed16),
-            Integer => Some(IntType::Signed32),
-            Oid => Some(IntType::Unsigned32),
-            _ => None,
-        }
-    }
 }
 
 fn allowed_index_operator_classes(algo: IndexAlgorithm, field: walkers::ScalarFieldWalker<'_>) -> Vec<OperatorClass> {

diff --git a/psl/builtin-connectors/src/sqlite_datamodel_connector.rs b/psl/builtin-connectors/src/sqlite_datamodel_connector.rs
@@ -1,7 +1,7 @@
 use enumflags2::BitFlags;
 use psl_core::{
     datamodel_connector::{
-        Connector, ConnectorCapability, ConstraintScope, IntType, NativeTypeConstructor, NativeTypeInstance,
+        Connector, ConnectorCapability, ConstraintScope, NativeTypeConstructor, NativeTypeInstance,
         ReferentialIntegrity,
     },
     diagnostics::{DatamodelError, Span},
@@ -115,8 +115,4 @@ impl Connector for SqliteDatamodelConnector {
 
         Ok(())
     }
-
-    fn int_type(&self, _native_type: serde_json::Value) -> Option<IntType> {
-        None
-    }
 }
diff --git a/psl/psl-core/src/datamodel_connector.rs b/psl/psl-core/src/datamodel_connector.rs
@@ -6,8 +6,6 @@ pub mod capabilities;
 pub mod constraint_names;
 /// Helpers for implementors of `Connector`.
 pub mod helper;
-/// Type to represent the storage and unsignedness of an integer type.
-pub mod int_type;
 /// Extensions for parser database walkers with context from the connector.
 pub mod walker_ext_traits;
 
@@ -21,7 +19,6 @@ pub use self::{
     capabilities::{ConnectorCapabilities, ConnectorCapability},
     empty_connector::EmptyDatamodelConnector,
     filters::*,
-    int_type::IntType,
     native_type_constructor::NativeTypeConstructor,
     native_type_instance::NativeTypeInstance,
     referential_integrity::ReferentialIntegrity,
@@ -96,10 +93,6 @@ pub trait Connector: Send + Sync {
         self.referential_actions(integrity).contains(action)
     }
 
-    /// Given a native integer type, returns its storage and unsignedness.
-    /// Returns `None` if the native type is not an integer.
-    fn int_type(&self, native_type: serde_json::Value) -> Option<IntType>;
-
     /// This is used by the query engine schema builder.
     ///
     /// For a given scalar type + native type combination, this method should return the name to be

diff --git a/psl/psl-core/src/datamodel_connector/empty_connector.rs b/psl/psl-core/src/datamodel_connector/empty_connector.rs
@@ -64,10 +64,6 @@ impl Connector for EmptyDatamodelConnector {
     fn validate_url(&self, _url: &str) -> Result<(), String> {
         Ok(())
     }
-
-    fn int_type(&self, _native_type: serde_json::Value) -> Option<IntType> {
-        None
-    }
 }
 
 #[cfg(test)]

diff --git a/psl/psl-core/src/datamodel_connector/int_type.rs b/psl/psl-core/src/datamodel_connector/int_type.rs