fix onConflict error

GetDutchie · Aug 27, 2024 · b6d2f04 · b6d2f04
1 parent bb2437c
commit b6d2f04
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/...rick_offline_first_with_supabase_build/test/offline_first_generator/test_on_conflict.dart b/...rick_offline_first_with_supabase_build/test/offline_first_generator/test_on_conflict.dart
@@ -52,7 +52,7 @@ class SupabaseDefinedAdapter extends OfflineFirstAdapter<SupabaseDefined> {
   @override
   final ignoreDuplicates = false;
   @override
-  final onConflict = user_id, other_id;
+  final onConflict = 'user_id, other_id';
   @override
   final uniqueFields = {};
   @override

diff --git a/packages/brick_supabase/lib/src/annotations/supabase_serializable.dart b/packages/brick_supabase/lib/src/annotations/supabase_serializable.dart
@@ -32,10 +32,11 @@ class SupabaseSerializable {
   /// Defaults to `FieldRename.snake` case.
   final FieldRename fieldRename;
 
-  /// Forwards to Supabase's ignoreDuplicates parameter.
+  /// Forwards to Supabase's `ignoreDuplicates` parameter.
   final bool ignoreDuplicates;
 
-  /// Forwards to Supabase's onConflict parameter.
+  /// Forwards to Supabase's `onConflict` parameter.
+  /// This should be comma-separated Supabase column names, not Dart fields.
   final String? onConflict;
 
   /// The Supabase table name to fetch from. For example, `"users"`

diff --git a/packages/brick_supabase/pubspec.yaml b/packages/brick_supabase/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/GetDutchie/brick/tree/main/packages/brick_supabase
 issue_tracker: https://github.com/GetDutchie/brick/issues
 repository: https://github.com/GetDutchie/brick
 
-version: 0.1.1
+version: 0.1.1+1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

diff --git a/packages/brick_supabase_generators/lib/src/supabase_serialize.dart b/packages/brick_supabase_generators/lib/src/supabase_serialize.dart
@@ -44,7 +44,8 @@ class SupabaseSerialize extends SupabaseSerdesGenerator
         '@override\nfinal defaultToNull = ${config?.defaultToNull};',
       '@override\nfinal fieldsToSupabaseColumns = {${fieldsToColumns.join(',\n')}};',
       '@override\nfinal ignoreDuplicates = ${config?.ignoreDuplicates};',
-      if (config?.onConflict != null) '@override\nfinal onConflict = ${config?.onConflict};',
+      if (config?.onConflict != null)
+        '@override\nfinal onConflict = ${config?.onConflict == null ? 'null' : "'${config?.onConflict}'"};',
       '@override\nfinal uniqueFields = {${uniqueFields.map((u) => "'$u'").join(',\n')}};',
     ];
   }

diff --git a/packages/brick_supabase_generators/pubspec.yaml b/packages/brick_supabase_generators/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/GetDutchie/brick/tree/main/packages/brick_supabase_
 issue_tracker: https://github.com/GetDutchie/brick/issues
 repository: https://github.com/GetDutchie/brick
 
-version: 0.1.1
+version: 0.1.1+1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"