Skip to content

fix(brick_sqlite_generator): Fix SQLite deserialization default fallback for non-nullable fields with null values #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KiddoV wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(brick_sqlite_generator): Fix SQLite deserialization default fallback for non-nullable fields with null values #674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions packages/brick_sqlite_generators/lib/src/sqlite_deserialize.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,27 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
// DateTime
if (checker.isDateTime) {
if (checker.isNullable) {
return '$fieldValue == null ? null : DateTime.tryParse($fieldValue$defaultValue as String)';
if (fieldAnnotation.defaultValue != null) {
return '$fieldValue == null ? null : DateTime.tryParse(($fieldValue as String?)$defaultValue)';
}
return '$fieldValue == null ? null : DateTime.tryParse($fieldValue as String)';
}
if (fieldAnnotation.defaultValue != null) {
return 'DateTime.parse(($fieldValue as String?)$defaultValue)';
}
return 'DateTime.parse($fieldValue$defaultValue as String)';
return 'DateTime.parse($fieldValue as String)';

// bool
} else if (checker.isBool) {
return '$fieldValue == 1';

// double, int, String
} else if (checker.isDartCoreType) {
return '$fieldValue as ${field.type}$defaultValue';

// Iterable
final typeName = SharedChecker.withoutNullability(field.type);
if (fieldAnnotation.defaultValue != null) {
return '($fieldValue as $typeName?)$defaultValue';
}
return '$fieldValue as ${field.type}';
} else if (checker.isIterable) {
final argTypeChecker = SharedChecker<SqliteModel>(checker.argType);
final argType = checker.unFuturedArgType;
Expand Down Expand Up @@ -207,6 +215,9 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
final nullablePrefix = checker.isNullable
? "$fieldValue == null ? ${fieldAnnotation.defaultValue ?? 'null'} : "
: '';
if (fieldAnnotation.defaultValue != null) {
return '$nullablePrefix${SharedChecker.withoutNullability(field.type)}.values.byName(($fieldValue as String?)$defaultValue)';
}
return '$nullablePrefix${SharedChecker.withoutNullability(field.type)}.values.byName($fieldValue as String)';
}

Expand All @@ -221,6 +232,9 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
} else if (checker.fromJsonConstructor != null) {
final klass = checker.targetType.element! as ClassElement;
final parameterType = checker.fromJsonConstructor!.formalParameters.first.type;
if (fieldAnnotation.defaultValue != null) {
return '${klass.displayName}.fromJson(jsonDecode(($fieldValue as String?)$defaultValue) as ${parameterType.getDisplayString()})';
}
return '${klass.displayName}.fromJson(jsonDecode($fieldValue as String) as ${parameterType.getDisplayString()})';
}

Expand Down