Fix order of arguments when reading custom types

simolus3 · Nov 9, 2023 · e79124e · e79124e
1 parent d770c16
commit e79124e
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 7 deletions.
diff --git a/drift/test/generated/converter.dart b/drift/test/generated/converter.dart
@@ -1,5 +1,32 @@
 import 'package:drift/drift.dart';
 
+class CustomTextType implements CustomSqlType<String> {
+  const CustomTextType();
+
+  @override
+  String mapToSqlLiteral(String dartValue) {
+    final escapedChars = dartValue.replaceAll('\'', '\'\'');
+    return "'$escapedChars'";
+  }
+
+  @override
+  Object mapToSqlParameter(String dartValue) {
+    return dartValue;
+  }
+
+  @override
+  String read(Object fromSql) {
+    return fromSql.toString();
+  }
+
+  @override
+  String sqlTypeName(GenerationContext context) {
+    // Still has text column affinity, but can be used to verify that the type
+    // really is used.
+    return 'MY_TEXT';
+  }
+}
+
 enum SyncType {
   locallyCreated,
   locallyUpdated,

diff --git a/drift/test/generated/custom_tables.g.dart b/drift/test/generated/custom_tables.g.dart
diff --git a/drift/test/generated/tables.drift b/drift/test/generated/tables.drift
@@ -6,7 +6,7 @@ CREATE TABLE no_ids (
 ) WITHOUT ROWID WITH NoIdRow;
 
 CREATE TABLE with_defaults (
-    a TEXT JSON KEY customJsonName DEFAULT 'something',
+    a `const CustomTextType()` JSON KEY customJsonName DEFAULT 'something',
     b INT UNIQUE
 );
 

diff --git a/drift/test/integration_tests/drift_files_test.dart b/drift/test/integration_tests/drift_files_test.dart
@@ -11,7 +11,7 @@ const _createNoIds =
     'WITHOUT ROWID;';
 
 const _createWithDefaults = 'CREATE TABLE IF NOT EXISTS "with_defaults" ('
-    "\"a\" TEXT DEFAULT 'something', \"b\" INTEGER UNIQUE);";
+    "\"a\" MY_TEXT DEFAULT 'something', \"b\" INTEGER UNIQUE);";
 
 const _createWithConstraints = 'CREATE TABLE IF NOT EXISTS "with_constraints" ('
     '"a" TEXT, "b" INTEGER NOT NULL, "c" REAL, '

diff --git a/drift_dev/CHANGELOG.md b/drift_dev/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.14.0-dev
+
+- Fix generated queries relying on custom types.
+
 ## 2.13.1
 
 - Add `has_separate_analyzer` option to optimize builds using the `not_shared` builder.

diff --git a/drift_dev/lib/src/writer/queries/query_writer.dart b/drift_dev/lib/src/writer/queries/query_writer.dart
@@ -210,7 +210,7 @@ class QueryWriter {
     if (column.sqlType.isCustom) {
       final method = isNullable ? 'readNullableWithType' : 'readWithType';
       final typeImpl = _emitter.dartCode(column.sqlType.custom!.expression);
-      code = 'row.$method<$rawDartType>($dartLiteral, $typeImpl)';
+      code = 'row.$method<$rawDartType>($typeImpl, $dartLiteral)';
     } else {
       final method = isNullable ? 'readNullable' : 'read';
       code = 'row.$method<$rawDartType>($dartLiteral)';