add standard comparison operators

BenoitRanque · BenoitRanque · commit ed42b7e547a8 · 2025-01-16T12:32:59.000-04:00
diff --git a/crates/configuration/src/version3/comparison.rs b/crates/configuration/src/version3/comparison.rs
@@ -29,22 +29,22 @@ impl ComparisonOperatorMapping {
             ComparisonOperatorMapping {
                 operator_name: "<=".to_string(),
                 exposed_name: "_lte".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::LessThanOrEqual,
             },
             ComparisonOperatorMapping {
                 operator_name: ">".to_string(),
                 exposed_name: "_gt".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::GreaterThan,
             },
             ComparisonOperatorMapping {
                 operator_name: ">=".to_string(),
                 exposed_name: "_gte".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::GreaterThanOrEqual,
             },
             ComparisonOperatorMapping {
                 operator_name: "<".to_string(),
                 exposed_name: "_lt".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::LessThan,
             },
             ComparisonOperatorMapping {
                 operator_name: "<>".to_string(),
diff --git a/crates/configuration/src/version3/metadata/database.rs b/crates/configuration/src/version3/metadata/database.rs
@@ -76,6 +76,10 @@ pub struct ComparisonOperator {
 pub enum OperatorKind {
     Equal,
     In,
+    LessThan,
+    LessThanOrEqual,
+    GreaterThan,
+    GreaterThanOrEqual,
     Custom,
 }
 
diff --git a/crates/configuration/src/version3/mod.rs b/crates/configuration/src/version3/mod.rs
@@ -1054,6 +1054,16 @@ fn convert_operator_kind(
     match operator_kind {
         metadata::OperatorKind::Equal => query_engine_metadata::metadata::OperatorKind::Equal,
         metadata::OperatorKind::In => query_engine_metadata::metadata::OperatorKind::In,
+        metadata::OperatorKind::LessThan => query_engine_metadata::metadata::OperatorKind::LessThan,
+        metadata::OperatorKind::LessThanOrEqual => {
+            query_engine_metadata::metadata::OperatorKind::LessThanOrEqual
+        }
+        metadata::OperatorKind::GreaterThan => {
+            query_engine_metadata::metadata::OperatorKind::GreaterThan
+        }
+        metadata::OperatorKind::GreaterThanOrEqual => {
+            query_engine_metadata::metadata::OperatorKind::GreaterThanOrEqual
+        }
         metadata::OperatorKind::Custom => query_engine_metadata::metadata::OperatorKind::Custom,
     }
 }
diff --git a/crates/configuration/src/version4/comparison.rs b/crates/configuration/src/version4/comparison.rs
@@ -29,22 +29,22 @@ impl ComparisonOperatorMapping {
             ComparisonOperatorMapping {
                 operator_name: "<=".to_string(),
                 exposed_name: "_lte".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::LessThanOrEqual,
             },
             ComparisonOperatorMapping {
                 operator_name: ">".to_string(),
                 exposed_name: "_gt".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::GreaterThan,
             },
             ComparisonOperatorMapping {
                 operator_name: ">=".to_string(),
                 exposed_name: "_gte".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::GreaterThanOrEqual,
             },
             ComparisonOperatorMapping {
                 operator_name: "<".to_string(),
                 exposed_name: "_lt".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::LessThan,
             },
             ComparisonOperatorMapping {
                 operator_name: "<>".to_string(),
diff --git a/crates/configuration/src/version4/metadata/database.rs b/crates/configuration/src/version4/metadata/database.rs
@@ -79,6 +79,10 @@ pub struct ComparisonOperator {
 pub enum OperatorKind {
     Equal,
     In,
+    LessThan,
+    LessThanOrEqual,
+    GreaterThan,
+    GreaterThanOrEqual,
     Custom,
 }
 
diff --git a/crates/configuration/src/version4/to_runtime_configuration.rs b/crates/configuration/src/version4/to_runtime_configuration.rs
@@ -349,6 +349,16 @@ fn convert_operator_kind(
     match operator_kind {
         metadata::OperatorKind::Equal => query_engine_metadata::metadata::OperatorKind::Equal,
         metadata::OperatorKind::In => query_engine_metadata::metadata::OperatorKind::In,
+        metadata::OperatorKind::LessThan => query_engine_metadata::metadata::OperatorKind::LessThan,
+        metadata::OperatorKind::LessThanOrEqual => {
+            query_engine_metadata::metadata::OperatorKind::LessThanOrEqual
+        }
+        metadata::OperatorKind::GreaterThan => {
+            query_engine_metadata::metadata::OperatorKind::GreaterThan
+        }
+        metadata::OperatorKind::GreaterThanOrEqual => {
+            query_engine_metadata::metadata::OperatorKind::GreaterThanOrEqual
+        }
         metadata::OperatorKind::Custom => query_engine_metadata::metadata::OperatorKind::Custom,
     }
 }
diff --git a/crates/configuration/src/version4/upgrade_from_v3.rs b/crates/configuration/src/version4/upgrade_from_v3.rs
@@ -156,6 +156,14 @@ fn upgrade_operator_kind(
     match operator_kind {
         version3::metadata::OperatorKind::Equal => metadata::OperatorKind::Equal,
         version3::metadata::OperatorKind::In => metadata::OperatorKind::In,
+        version3::metadata::OperatorKind::LessThan => metadata::OperatorKind::LessThan,
+        version3::metadata::OperatorKind::LessThanOrEqual => {
+            metadata::OperatorKind::LessThanOrEqual
+        }
+        version3::metadata::OperatorKind::GreaterThan => metadata::OperatorKind::GreaterThan,
+        version3::metadata::OperatorKind::GreaterThanOrEqual => {
+            metadata::OperatorKind::GreaterThanOrEqual
+        }
         version3::metadata::OperatorKind::Custom => metadata::OperatorKind::Custom,
     }
 }
diff --git a/crates/configuration/src/version5/comparison.rs b/crates/configuration/src/version5/comparison.rs
@@ -29,22 +29,22 @@ impl ComparisonOperatorMapping {
             ComparisonOperatorMapping {
                 operator_name: "<=".to_string(),
                 exposed_name: "_lte".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::LessThanOrEqual,
             },
             ComparisonOperatorMapping {
                 operator_name: ">".to_string(),
                 exposed_name: "_gt".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::GreaterThan,
             },
             ComparisonOperatorMapping {
                 operator_name: ">=".to_string(),
                 exposed_name: "_gte".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::GreaterThanOrEqual,
             },
             ComparisonOperatorMapping {
                 operator_name: "<".to_string(),
                 exposed_name: "_lt".to_string(),
-                operator_kind: OperatorKind::Custom,
+                operator_kind: OperatorKind::LessThan,
             },
             ComparisonOperatorMapping {
                 operator_name: "<>".to_string(),
diff --git a/crates/configuration/src/version5/metadata/database.rs b/crates/configuration/src/version5/metadata/database.rs
@@ -85,6 +85,10 @@ pub struct ComparisonOperator {
 pub enum OperatorKind {
     Equal,
     In,
+    LessThan,
+    LessThanOrEqual,
+    GreaterThan,
+    GreaterThanOrEqual,
     Custom,
 }
 
diff --git a/crates/configuration/src/version5/to_runtime_configuration.rs b/crates/configuration/src/version5/to_runtime_configuration.rs
@@ -346,6 +346,16 @@ fn convert_operator_kind(
     match operator_kind {
         metadata::OperatorKind::Equal => query_engine_metadata::metadata::OperatorKind::Equal,
         metadata::OperatorKind::In => query_engine_metadata::metadata::OperatorKind::In,
+        metadata::OperatorKind::LessThan => query_engine_metadata::metadata::OperatorKind::LessThan,
+        metadata::OperatorKind::LessThanOrEqual => {
+            query_engine_metadata::metadata::OperatorKind::LessThanOrEqual
+        }
+        metadata::OperatorKind::GreaterThan => {
+            query_engine_metadata::metadata::OperatorKind::GreaterThan
+        }
+        metadata::OperatorKind::GreaterThanOrEqual => {
+            query_engine_metadata::metadata::OperatorKind::GreaterThanOrEqual
+        }
         metadata::OperatorKind::Custom => query_engine_metadata::metadata::OperatorKind::Custom,
     }
 }
diff --git a/crates/configuration/src/version5/upgrade_from_v4.rs b/crates/configuration/src/version5/upgrade_from_v4.rs
@@ -77,6 +77,14 @@ fn upgrade_operator_kind(
     match operator_kind {
         version4::metadata::OperatorKind::Equal => metadata::OperatorKind::Equal,
         version4::metadata::OperatorKind::In => metadata::OperatorKind::In,
+        version4::metadata::OperatorKind::LessThan => metadata::OperatorKind::LessThan,
+        version4::metadata::OperatorKind::LessThanOrEqual => {
+            metadata::OperatorKind::LessThanOrEqual
+        }
+        version4::metadata::OperatorKind::GreaterThan => metadata::OperatorKind::GreaterThan,
+        version4::metadata::OperatorKind::GreaterThanOrEqual => {
+            metadata::OperatorKind::GreaterThanOrEqual
+        }
         version4::metadata::OperatorKind::Custom => metadata::OperatorKind::Custom,
     }
 }
diff --git a/crates/connectors/ndc-postgres/src/schema/mod.rs b/crates/connectors/ndc-postgres/src/schema/mod.rs
@@ -81,6 +81,18 @@ pub fn get_schema(
                                 metadata::OperatorKind::In => {
                                     models::ComparisonOperatorDefinition::In
                                 }
+                                metadata::OperatorKind::LessThan => {
+                                    models::ComparisonOperatorDefinition::LessThan
+                                }
+                                metadata::OperatorKind::LessThanOrEqual => {
+                                    models::ComparisonOperatorDefinition::LessThanOrEqual
+                                }
+                                metadata::OperatorKind::GreaterThan => {
+                                    models::ComparisonOperatorDefinition::GreaterThan
+                                }
+                                metadata::OperatorKind::GreaterThanOrEqual => {
+                                    models::ComparisonOperatorDefinition::GreaterThanOrEqual
+                                }
                                 metadata::OperatorKind::Custom => {
                                     models::ComparisonOperatorDefinition::Custom {
                                         argument_type: models::Type::Named {
diff --git a/crates/query-engine/metadata/src/metadata/database.rs b/crates/query-engine/metadata/src/metadata/database.rs
@@ -77,6 +77,10 @@ pub struct ComparisonOperator {
 pub enum OperatorKind {
     Equal,
     In,
+    LessThan,
+    LessThanOrEqual,
+    GreaterThan,
+    GreaterThanOrEqual,
     Custom,
 }
 
