Add test to ensure that generated expressions support dialect-aware c…

…ustom types
simolus3 · Mar 5, 2024 · ca0c70e · ca0c70e
1 parent e423157
commit ca0c70e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/drift/lib/src/runtime/query_builder/expressions/custom.dart b/drift/lib/src/runtime/query_builder/expressions/custom.dart
@@ -24,14 +24,14 @@ class CustomExpression<D extends Object> extends Expression<D> {
   @override
   final Precedence precedence;
 
-  final CustomSqlType<D>? _customSqlType;
+  final UserDefinedSqlType<D>? _customSqlType;
 
   /// Constructs a custom expression by providing the raw sql [content].
   const CustomExpression(
     this.content, {
     this.watchedTables = const [],
     this.precedence = Precedence.unknown,
-    CustomSqlType<D>? customType,
+    UserDefinedSqlType<D>? customType,
   })  : _dialectSpecificContent = null,
         _customSqlType = customType;
 
@@ -41,7 +41,7 @@ class CustomExpression<D extends Object> extends Expression<D> {
     Map<SqlDialect, String> content, {
     this.watchedTables = const [],
     this.precedence = Precedence.unknown,
-    CustomSqlType<D>? customType,
+    UserDefinedSqlType<D>? customType,
   })  : _dialectSpecificContent = content,
         content = '',
         _customSqlType = customType;

diff --git a/drift/test/database/expressions/custom_types_test.dart b/drift/test/database/expressions/custom_types_test.dart
@@ -44,6 +44,23 @@ void main() {
     expect(exp, generates('?', [10]));
     expect(exp.driftSqlType, isA<_NegatedIntType>());
   });
+
+  test('also supports dialect-aware types', () {
+    const b = CustomExpression(
+      'b',
+      customType: DialectAwareSqlType<int>.via(
+        fallback: _NegatedIntType(),
+        overrides: {SqlDialect.postgres: DriftSqlType.int},
+      ),
+      precedence: Precedence.primary,
+    );
+
+    expect(b.equals(3), generates('b = ?', [-3]));
+    expect(
+        b.equals(3),
+        generatesWithOptions('b = \$1',
+            variables: [3], dialect: SqlDialect.postgres));
+  });
 }
 
 class _NegatedIntType implements CustomSqlType<int> {