From 48dfcc9c09d2d6bda110786eedc8c85dd0ae8ed5 Mon Sep 17 00:00:00 2001 From: pankaj-basnet <165250380+pankaj-basnet@users.noreply.github.com> Date: Wed, 12 Aug 2026 23:59:03 +0545 Subject: [PATCH] refactor(schema): remove legacy pre-2.7 workout session columns --- lib/database/powersync/database.g.dart | 156 +------------------- lib/database/powersync/tables/routines.dart | 7 - lib/features/routines/models/session.dart | 8 - 3 files changed, 1 insertion(+), 170 deletions(-) diff --git a/lib/database/powersync/database.g.dart b/lib/database/powersync/database.g.dart index 18dbe7b23..913db95d4 100644 --- a/lib/database/powersync/database.g.dart +++ b/lib/database/powersync/database.g.dart @@ -6273,14 +6273,6 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable type: DriftSqlType.int, requiredDuringInsert: false, ); - @override - late final GeneratedColumnWithTypeConverter date = GeneratedColumn( - 'date', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ).withConverter($WorkoutSessionTableTable.$converterdate); static const VerificationMeta _notesMeta = const VerificationMeta('notes'); @override late final GeneratedColumn notes = GeneratedColumn( @@ -6302,34 +6294,12 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable $WorkoutSessionTableTable.$converterimpression, ); @override - late final GeneratedColumnWithTypeConverter timeStart = - GeneratedColumn( - 'time_start', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ).withConverter( - $WorkoutSessionTableTable.$convertertimeStartn, - ); - @override - late final GeneratedColumnWithTypeConverter timeEnd = GeneratedColumn( - 'time_end', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ).withConverter($WorkoutSessionTableTable.$convertertimeEndn); - @override List get $columns => [ id, routineId, dayId, - date, notes, impression, - timeStart, - timeEnd, ]; @override String get aliasedName => _alias ?? actualTableName; @@ -6385,12 +6355,6 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable DriftSqlType.int, data['${effectivePrefix}routine_id'], ), - date: $WorkoutSessionTableTable.$converterdate.fromSql( - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}date'], - )!, - ), impression: $WorkoutSessionTableTable.$converterimpression.fromSql( attachedDatabase.typeMapping.read( DriftSqlType.string, @@ -6401,18 +6365,6 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable DriftSqlType.string, data['${effectivePrefix}notes'], ), - timeStart: $WorkoutSessionTableTable.$convertertimeStartn.fromSql( - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}time_start'], - ), - ), - timeEnd: $WorkoutSessionTableTable.$convertertimeEndn.fromSql( - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}time_end'], - ), - ), ); } @@ -6421,72 +6373,47 @@ class $WorkoutSessionTableTable extends WorkoutSessionTable return $WorkoutSessionTableTable(attachedDatabase, alias); } - static TypeConverter $converterdate = const DateOnlyTextConverter(); static TypeConverter $converterimpression = const WorkoutImpressionConverter(); - static TypeConverter $convertertimeStart = const TimeOfDayConverter(); - static TypeConverter $convertertimeStartn = NullAwareTypeConverter.wrap( - $convertertimeStart, - ); - static TypeConverter $convertertimeEnd = const TimeOfDayConverter(); - static TypeConverter $convertertimeEndn = NullAwareTypeConverter.wrap( - $convertertimeEnd, - ); } class WorkoutSessionTableCompanion extends UpdateCompanion { final Value id; final Value routineId; final Value dayId; - final Value date; final Value notes; final Value impression; - final Value timeStart; - final Value timeEnd; final Value rowid; const WorkoutSessionTableCompanion({ this.id = const Value.absent(), this.routineId = const Value.absent(), this.dayId = const Value.absent(), - this.date = const Value.absent(), this.notes = const Value.absent(), this.impression = const Value.absent(), - this.timeStart = const Value.absent(), - this.timeEnd = const Value.absent(), this.rowid = const Value.absent(), }); WorkoutSessionTableCompanion.insert({ this.id = const Value.absent(), this.routineId = const Value.absent(), this.dayId = const Value.absent(), - required DateTime date, this.notes = const Value.absent(), required WorkoutImpression impression, - this.timeStart = const Value.absent(), - this.timeEnd = const Value.absent(), this.rowid = const Value.absent(), - }) : date = Value(date), - impression = Value(impression); + }) : impression = Value(impression); static Insertable custom({ Expression? id, Expression? routineId, Expression? dayId, - Expression? date, Expression? notes, Expression? impression, - Expression? timeStart, - Expression? timeEnd, Expression? rowid, }) { return RawValuesInsertable({ if (id != null) 'id': id, if (routineId != null) 'routine_id': routineId, if (dayId != null) 'day_id': dayId, - if (date != null) 'date': date, if (notes != null) 'notes': notes, if (impression != null) 'impression': impression, - if (timeStart != null) 'time_start': timeStart, - if (timeEnd != null) 'time_end': timeEnd, if (rowid != null) 'rowid': rowid, }); } @@ -6495,22 +6422,16 @@ class WorkoutSessionTableCompanion extends UpdateCompanion { Value? id, Value? routineId, Value? dayId, - Value? date, Value? notes, Value? impression, - Value? timeStart, - Value? timeEnd, Value? rowid, }) { return WorkoutSessionTableCompanion( id: id ?? this.id, routineId: routineId ?? this.routineId, dayId: dayId ?? this.dayId, - date: date ?? this.date, notes: notes ?? this.notes, impression: impression ?? this.impression, - timeStart: timeStart ?? this.timeStart, - timeEnd: timeEnd ?? this.timeEnd, rowid: rowid ?? this.rowid, ); } @@ -6527,11 +6448,6 @@ class WorkoutSessionTableCompanion extends UpdateCompanion { if (dayId.present) { map['day_id'] = Variable(dayId.value); } - if (date.present) { - map['date'] = Variable( - $WorkoutSessionTableTable.$converterdate.toSql(date.value), - ); - } if (notes.present) { map['notes'] = Variable(notes.value); } @@ -6540,16 +6456,6 @@ class WorkoutSessionTableCompanion extends UpdateCompanion { $WorkoutSessionTableTable.$converterimpression.toSql(impression.value), ); } - if (timeStart.present) { - map['time_start'] = Variable( - $WorkoutSessionTableTable.$convertertimeStartn.toSql(timeStart.value), - ); - } - if (timeEnd.present) { - map['time_end'] = Variable( - $WorkoutSessionTableTable.$convertertimeEndn.toSql(timeEnd.value), - ); - } if (rowid.present) { map['rowid'] = Variable(rowid.value); } @@ -6562,11 +6468,8 @@ class WorkoutSessionTableCompanion extends UpdateCompanion { ..write('id: $id, ') ..write('routineId: $routineId, ') ..write('dayId: $dayId, ') - ..write('date: $date, ') ..write('notes: $notes, ') ..write('impression: $impression, ') - ..write('timeStart: $timeStart, ') - ..write('timeEnd: $timeEnd, ') ..write('rowid: $rowid') ..write(')')) .toString(); @@ -17659,11 +17562,8 @@ typedef $$WorkoutSessionTableTableCreateCompanionBuilder = Value id, Value routineId, Value dayId, - required DateTime date, Value notes, required WorkoutImpression impression, - Value timeStart, - Value timeEnd, Value rowid, }); typedef $$WorkoutSessionTableTableUpdateCompanionBuilder = @@ -17671,11 +17571,8 @@ typedef $$WorkoutSessionTableTableUpdateCompanionBuilder = Value id, Value routineId, Value dayId, - Value date, Value notes, Value impression, - Value timeStart, - Value timeEnd, Value rowid, }); @@ -17703,11 +17600,6 @@ class $$WorkoutSessionTableTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnWithTypeConverterFilters get date => $composableBuilder( - column: $table.date, - builder: (column) => ColumnWithTypeConverterFilters(column), - ); - ColumnFilters get notes => $composableBuilder( column: $table.notes, builder: (column) => ColumnFilters(column), @@ -17718,16 +17610,6 @@ class $$WorkoutSessionTableTableFilterComposer column: $table.impression, builder: (column) => ColumnWithTypeConverterFilters(column), ); - - ColumnWithTypeConverterFilters get timeStart => $composableBuilder( - column: $table.timeStart, - builder: (column) => ColumnWithTypeConverterFilters(column), - ); - - ColumnWithTypeConverterFilters get timeEnd => $composableBuilder( - column: $table.timeEnd, - builder: (column) => ColumnWithTypeConverterFilters(column), - ); } class $$WorkoutSessionTableTableOrderingComposer @@ -17754,11 +17636,6 @@ class $$WorkoutSessionTableTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get date => $composableBuilder( - column: $table.date, - builder: (column) => ColumnOrderings(column), - ); - ColumnOrderings get notes => $composableBuilder( column: $table.notes, builder: (column) => ColumnOrderings(column), @@ -17768,16 +17645,6 @@ class $$WorkoutSessionTableTableOrderingComposer column: $table.impression, builder: (column) => ColumnOrderings(column), ); - - ColumnOrderings get timeStart => $composableBuilder( - column: $table.timeStart, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get timeEnd => $composableBuilder( - column: $table.timeEnd, - builder: (column) => ColumnOrderings(column), - ); } class $$WorkoutSessionTableTableAnnotationComposer @@ -17798,9 +17665,6 @@ class $$WorkoutSessionTableTableAnnotationComposer GeneratedColumn get dayId => $composableBuilder(column: $table.dayId, builder: (column) => column); - GeneratedColumnWithTypeConverter get date => - $composableBuilder(column: $table.date, builder: (column) => column); - GeneratedColumn get notes => $composableBuilder(column: $table.notes, builder: (column) => column); @@ -17808,12 +17672,6 @@ class $$WorkoutSessionTableTableAnnotationComposer column: $table.impression, builder: (column) => column, ); - - GeneratedColumnWithTypeConverter get timeStart => - $composableBuilder(column: $table.timeStart, builder: (column) => column); - - GeneratedColumnWithTypeConverter get timeEnd => - $composableBuilder(column: $table.timeEnd, builder: (column) => column); } class $$WorkoutSessionTableTableTableManager @@ -17856,21 +17714,15 @@ class $$WorkoutSessionTableTableTableManager Value id = const Value.absent(), Value routineId = const Value.absent(), Value dayId = const Value.absent(), - Value date = const Value.absent(), Value notes = const Value.absent(), Value impression = const Value.absent(), - Value timeStart = const Value.absent(), - Value timeEnd = const Value.absent(), Value rowid = const Value.absent(), }) => WorkoutSessionTableCompanion( id: id, routineId: routineId, dayId: dayId, - date: date, notes: notes, impression: impression, - timeStart: timeStart, - timeEnd: timeEnd, rowid: rowid, ), createCompanionCallback: @@ -17878,21 +17730,15 @@ class $$WorkoutSessionTableTableTableManager Value id = const Value.absent(), Value routineId = const Value.absent(), Value dayId = const Value.absent(), - required DateTime date, Value notes = const Value.absent(), required WorkoutImpression impression, - Value timeStart = const Value.absent(), - Value timeEnd = const Value.absent(), Value rowid = const Value.absent(), }) => WorkoutSessionTableCompanion.insert( id: id, routineId: routineId, dayId: dayId, - date: date, notes: notes, impression: impression, - timeStart: timeStart, - timeEnd: timeEnd, rowid: rowid, ), withReferenceMapper: (p0) => diff --git a/lib/database/powersync/tables/routines.dart b/lib/database/powersync/tables/routines.dart index 56d962530..0aba3f30c 100644 --- a/lib/database/powersync/tables/routines.dart +++ b/lib/database/powersync/tables/routines.dart @@ -120,12 +120,8 @@ class WorkoutSessionTable extends Table { TextColumn get id => text().clientDefault(() => ps.uuid.v7())(); IntColumn get routineId => integer().named('routine_id').nullable()(); IntColumn get dayId => integer().named('day_id').nullable()(); - TextColumn get date => text().map(const DateOnlyTextConverter())(); TextColumn get notes => text().nullable()(); TextColumn get impression => text().map(const WorkoutImpressionConverter())(); - TextColumn get timeStart => - text().named('time_start').nullable().map(const TimeOfDayConverter())(); - TextColumn get timeEnd => text().named('time_end').nullable().map(const TimeOfDayConverter())(); } const PowersyncWorkoutSessionTable = ps.Table( @@ -133,11 +129,8 @@ const PowersyncWorkoutSessionTable = ps.Table( [ ps.Column.integer('routine_id'), ps.Column.integer('day_id'), - ps.Column.text('date'), ps.Column.text('notes'), ps.Column.text('impression'), - ps.Column.text('time_start'), - ps.Column.text('time_end'), ], indexes: [ ps.Index('routine_idx', [ps.IndexedColumn('routine_id')]), diff --git a/lib/features/routines/models/session.dart b/lib/features/routines/models/session.dart index cb65f26b2..1b33d8c29 100644 --- a/lib/features/routines/models/session.dart +++ b/lib/features/routines/models/session.dart @@ -98,16 +98,8 @@ class WorkoutSession with _$WorkoutSession { id: id != null ? drift.Value(id!) : const drift.Value.absent(), routineId: drift.Value(routineId), dayId: drift.Value(dayId), - // Server-side `date` is a `DateField` (no time, no TZ). We send here the - // calendar day the user picked, packaged as midnight-UTC so it round-trips - // through PowerSync's ISO8601 wire format and lands on the right day on - // the server. - date: drift.Value(DateTime.utc(date.year, date.month, date.day)), notes: drift.Value(notes), impression: drift.Value(impression), - // Explicit NULL, not absent: clearing a time has to clear the column too - timeStart: drift.Value(timeStart), - timeEnd: drift.Value(timeEnd), ); }