diff --git a/mnemo_cards_admin/@/components/ui/button.tsx b/mnemo_cards_admin/@/components/ui/button.tsx index 36496a2..38ecac7 100644 --- a/mnemo_cards_admin/@/components/ui/button.tsx +++ b/mnemo_cards_admin/@/components/ui/button.tsx @@ -53,4 +53,5 @@ const Button = React.forwardRef( ) Button.displayName = "Button" +// eslint-disable-next-line react-refresh/only-export-components export { Button, buttonVariants } diff --git a/mnemo_cards_admin/@/components/ui/form.tsx b/mnemo_cards_admin/@/components/ui/form.tsx index a98b0ae..d7bf186 100644 --- a/mnemo_cards_admin/@/components/ui/form.tsx +++ b/mnemo_cards_admin/@/components/ui/form.tsx @@ -1,3 +1,4 @@ +/* eslint-disable react-refresh/only-export-components */ import * as React from "react" import * as LabelPrimitive from "@radix-ui/react-label" import { Slot } from "@radix-ui/react-slot" diff --git a/mnemo_cards_admin/src/api/auth.ts b/mnemo_cards_admin/src/api/auth.ts index be39eac..d2c664b 100644 --- a/mnemo_cards_admin/src/api/auth.ts +++ b/mnemo_cards_admin/src/api/auth.ts @@ -1,5 +1,6 @@ import { adminApiClient } from './client' import type { AuthResponse, RequestCodeResponse, CodeStatusResponse } from '@/types/models' +import type { AxiosError } from 'axios' export const authApi = { // Request authentication code (creates web code) @@ -13,9 +14,10 @@ export const authApi = { try { const response = await adminApiClient.get(`/api/v2/admin/auth/code-status/${code}`) return response.data - } catch (error: any) { + } catch (error) { + const axiosError = error as AxiosError // If 404, return a proper error response - if (error.response?.status === 404) { + if (axiosError.response?.status === 404) { return { success: false, code: code, @@ -40,7 +42,7 @@ export const authApi = { }, // Get current admin info (for token validation) - getCurrentUser: async (): Promise<{ success: boolean; user?: any; message?: string }> => { + getCurrentUser: async (): Promise<{ success: boolean; user?: unknown; message?: string }> => { const response = await adminApiClient.get('/api/v2/admin/auth/me') return response.data }, diff --git a/mnemo_cards_admin/src/api/client.test.ts b/mnemo_cards_admin/src/api/client.test.ts index eca6ad6..4d56656 100644 --- a/mnemo_cards_admin/src/api/client.test.ts +++ b/mnemo_cards_admin/src/api/client.test.ts @@ -44,8 +44,8 @@ describe('API Clients', () => { const token = 'test-admin-token' localStorage.setItem('admin_token', token) - const requestConfig = { headers: {} } - const addAuthToken = (config: any) => { + const requestConfig = { headers: {} as Record } + const addAuthToken = (config: { headers: Record }) => { const storedToken = localStorage.getItem('admin_token') if (storedToken) { config.headers.Authorization = `Bearer ${storedToken}` @@ -58,8 +58,8 @@ describe('API Clients', () => { }) it('should not add authorization header when no token exists', () => { - const requestConfig = { headers: {} } - const addAuthToken = (config: any) => { + const requestConfig = { headers: {} as Record } + const addAuthToken = (config: { headers: Record }) => { const storedToken = localStorage.getItem('admin_token') if (storedToken) { config.headers.Authorization = `Bearer ${storedToken}` @@ -81,7 +81,7 @@ describe('API Clients', () => { writable: true, }) - const handleAuthError = (error: any) => { + const handleAuthError = (error: { response?: { status?: number } }) => { if (error.response?.status === 401) { localStorage.removeItem('admin_token') window.location.href = '/login' @@ -108,7 +108,7 @@ describe('API Clients', () => { writable: true, }) - const handleAuthError = (error: any) => { + const handleAuthError = (error: { response?: { status?: number } }) => { if (error.response?.status === 401) { localStorage.removeItem('admin_token') window.location.href = '/login' diff --git a/mnemo_cards_admin/src/api/client.ts b/mnemo_cards_admin/src/api/client.ts index a35d965..695c722 100644 --- a/mnemo_cards_admin/src/api/client.ts +++ b/mnemo_cards_admin/src/api/client.ts @@ -1,4 +1,4 @@ -import axios from 'axios' +import axios, { type AxiosError, type InternalAxiosRequestConfig } from 'axios' import { useAuthStore } from '@/stores/authStore' const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'https://api.mnemo-cards.online' @@ -23,7 +23,7 @@ export const adminApiClient = axios.create({ }) // Request interceptor to add auth token -const addAuthToken = (config: any) => { +const addAuthToken = (config: InternalAxiosRequestConfig) => { const token = localStorage.getItem('admin_token') const isPublicAuthEndpoint = config.url?.includes('/admin/auth/request-code') || @@ -33,7 +33,7 @@ const addAuthToken = (config: any) => { if (token && token.trim()) { // Ensure headers object exists if (!config.headers) { - config.headers = {} + config.headers = {} as InternalAxiosRequestConfig['headers'] } const trimmedToken = token.trim() // Set Authorization header - axios will normalize it to lowercase for HTTP @@ -61,14 +61,15 @@ const addAuthToken = (config: any) => { let isLoggingOut = false // Response interceptor for error handling -const handleAuthError = (error: any) => { - if (error.response?.status === 401) { +const handleAuthError = (error: unknown) => { + const axiosError = error as AxiosError + if (axiosError.response?.status === 401) { // Check if we're already on login page const currentPath = window.location.pathname const isPublicAuthEndpoint = - error.config?.url?.includes('/admin/auth/request-code') || - error.config?.url?.includes('/admin/auth/verify-code') || - error.config?.url?.includes('/admin/auth/code-status') + axiosError.config?.url?.includes('/admin/auth/request-code') || + axiosError.config?.url?.includes('/admin/auth/verify-code') || + axiosError.config?.url?.includes('/admin/auth/code-status') // Don't logout for public auth endpoints or if already on login page if (currentPath === '/login' || isPublicAuthEndpoint) { diff --git a/mnemo_cards_admin/src/components/ui/badge.tsx b/mnemo_cards_admin/src/components/ui/badge.tsx index f000e3e..59d9a54 100644 --- a/mnemo_cards_admin/src/components/ui/badge.tsx +++ b/mnemo_cards_admin/src/components/ui/badge.tsx @@ -33,4 +33,5 @@ function Badge({ className, variant, ...props }: BadgeProps) { ) } +// eslint-disable-next-line react-refresh/only-export-components export { Badge, badgeVariants } diff --git a/mnemo_cards_admin/src/components/ui/button.tsx b/mnemo_cards_admin/src/components/ui/button.tsx index c061215..9309cc2 100644 --- a/mnemo_cards_admin/src/components/ui/button.tsx +++ b/mnemo_cards_admin/src/components/ui/button.tsx @@ -55,4 +55,5 @@ const Button = React.forwardRef( ) Button.displayName = "Button" +// eslint-disable-next-line react-refresh/only-export-components export { Button, buttonVariants } diff --git a/mnemo_cards_admin/src/components/ui/input.tsx b/mnemo_cards_admin/src/components/ui/input.tsx index 677d05f..5c17e74 100644 --- a/mnemo_cards_admin/src/components/ui/input.tsx +++ b/mnemo_cards_admin/src/components/ui/input.tsx @@ -2,8 +2,7 @@ import * as React from "react" import { cn } from "@/lib/utils" -export interface InputProps - extends React.InputHTMLAttributes {} +export type InputProps = React.InputHTMLAttributes const Input = React.forwardRef( ({ className, type, ...props }, ref) => { diff --git a/mnemo_cards_admin/src/components/ui/textarea.tsx b/mnemo_cards_admin/src/components/ui/textarea.tsx index 9f9a6dc..12c9136 100644 --- a/mnemo_cards_admin/src/components/ui/textarea.tsx +++ b/mnemo_cards_admin/src/components/ui/textarea.tsx @@ -2,8 +2,7 @@ import * as React from "react" import { cn } from "@/lib/utils" -export interface TextareaProps - extends React.TextareaHTMLAttributes {} +export type TextareaProps = React.TextareaHTMLAttributes const Textarea = React.forwardRef( ({ className, ...props }, ref) => { diff --git a/mnemo_cards_admin/src/pages/CardsPage.tsx b/mnemo_cards_admin/src/pages/CardsPage.tsx index 0782bec..6ff0ada 100644 --- a/mnemo_cards_admin/src/pages/CardsPage.tsx +++ b/mnemo_cards_admin/src/pages/CardsPage.tsx @@ -3,6 +3,7 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query' import { toast } from 'sonner' import { cardsApi } from '@/api/cards' import type { GameCardDto, PaginatedResponse } from '@/types/models' +import type { AxiosError } from 'axios' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card' @@ -71,8 +72,9 @@ export default function CardsPage() { toast.success('Card created successfully') closeDialog() }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to create card') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to create card') }, }) @@ -83,8 +85,9 @@ export default function CardsPage() { toast.success('Card updated successfully') closeDialog() }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to update card') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to update card') }, }) @@ -96,8 +99,9 @@ export default function CardsPage() { setIsDeleteDialogOpen(false) setCardToDelete(null) }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to delete card') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to delete card') }, }) diff --git a/mnemo_cards_admin/src/pages/PacksPage.tsx b/mnemo_cards_admin/src/pages/PacksPage.tsx index 2dcfb8a..ab072e6 100644 --- a/mnemo_cards_admin/src/pages/PacksPage.tsx +++ b/mnemo_cards_admin/src/pages/PacksPage.tsx @@ -3,6 +3,7 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query' import { toast } from 'sonner' import { packsApi } from '@/api/packs' import type { EditCardPackDto, CardPackPreviewDto, PaginatedResponse } from '@/types/models' +import type { AxiosError } from 'axios' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card' @@ -77,8 +78,9 @@ export default function PacksPage() { toast.success('Pack created successfully') closeDialog() }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to create pack') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to create pack') }, }) @@ -89,8 +91,9 @@ export default function PacksPage() { toast.success('Pack updated successfully') closeDialog() }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to update pack') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to update pack') }, }) @@ -102,8 +105,9 @@ export default function PacksPage() { setIsDeleteDialogOpen(false) setPackToDelete(null) }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to delete pack') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to delete pack') }, }) @@ -141,7 +145,7 @@ export default function PacksPage() { order: fullPack.order || 0, }) setIsDialogOpen(true) - } catch (error) { + } catch { toast.error('Failed to load pack details') } } diff --git a/mnemo_cards_admin/src/pages/UsersPage.tsx b/mnemo_cards_admin/src/pages/UsersPage.tsx index 2d3e4fe..bea0c41 100644 --- a/mnemo_cards_admin/src/pages/UsersPage.tsx +++ b/mnemo_cards_admin/src/pages/UsersPage.tsx @@ -3,6 +3,7 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query' import { toast } from 'sonner' import { usersApi } from '@/api/users' import type { UserDto, PaginatedResponse, PaymentDto } from '@/types/models' +import type { AxiosError } from 'axios' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card' @@ -71,8 +72,9 @@ export default function UsersPage() { toast.success('User updated successfully') closeEditDialog() }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to update user') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to update user') }, }) @@ -84,8 +86,9 @@ export default function UsersPage() { setIsDeleteDialogOpen(false) setUserToDelete(null) }, - onError: (error: any) => { - toast.error(error.response?.data?.message || 'Failed to delete user') + onError: (error: unknown) => { + const axiosError = error as AxiosError<{ message?: string }> + toast.error(axiosError.response?.data?.message || 'Failed to delete user') }, }) @@ -112,7 +115,7 @@ export default function UsersPage() { setUserPurchases(purchases) setSelectedUser(user) setIsPurchasesDialogOpen(true) - } catch (error) { + } catch { toast.error('Failed to load user purchases') } } diff --git a/mnemo_cards_admin/src/types/models.ts b/mnemo_cards_admin/src/types/models.ts index 3a063b7..87cf455 100644 --- a/mnemo_cards_admin/src/types/models.ts +++ b/mnemo_cards_admin/src/types/models.ts @@ -55,8 +55,8 @@ export interface UserDto { purchases: string[] subscription?: boolean subscriptionFeatures: string[] - userDataDto?: any - userSettingsDto?: any + userDataDto?: unknown + userSettingsDto?: unknown } export interface PaymentDto { diff --git a/mnemo_cards_backend/isar/db.isar.lock b/mnemo_cards_backend/isar/db.isar.lock index 49ab6c3..cd3369f 100644 Binary files a/mnemo_cards_backend/isar/db.isar.lock and b/mnemo_cards_backend/isar/db.isar.lock differ diff --git a/mnemo_cards_backend/lib/api/purchase/payment_drift_extension.dart b/mnemo_cards_backend/lib/api/purchase/payment_drift_extension.dart index 10c4fea..d31e45f 100644 --- a/mnemo_cards_backend/lib/api/purchase/payment_drift_extension.dart +++ b/mnemo_cards_backend/lib/api/purchase/payment_drift_extension.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:mnemo_cards_common/mnemo_cards_common.dart'; import 'package:drift/drift.dart' as drift; @@ -32,7 +33,7 @@ extension PaymentToDto on Payment { ), externalToken: externalToken, meta: meta, - date: date, + date: date.dateTime, products: productsList, ); } @@ -52,7 +53,7 @@ extension PaymentFromDto on PaymentDto { paymentSystem: paymentSystem.name, externalToken: drift.Value(externalToken), meta: drift.Value(meta), - date: drift.Value(date), + date: drift.Value(PgDateTime(date)), products: drift.Value(productsJson), ); } @@ -65,7 +66,7 @@ extension PaymentUpdate on PaymentDto { status: drift.Value(status.name), externalToken: drift.Value(externalToken), meta: drift.Value(meta), - updatedAt: drift.Value(DateTime.now()), + updatedAt: drift.Value(PgDateTime(DateTime.now())), ); } } diff --git a/mnemo_cards_backend/lib/api/purchase/payment_manager.dart b/mnemo_cards_backend/lib/api/purchase/payment_manager.dart index 399a931..28744d1 100644 --- a/mnemo_cards_backend/lib/api/purchase/payment_manager.dart +++ b/mnemo_cards_backend/lib/api/purchase/payment_manager.dart @@ -1,4 +1,5 @@ import 'dart:developer'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/api/purchase/google_play_purchase_handler.dart'; import 'package:mnemo_cards_backend/database/database.dart'; @@ -69,8 +70,8 @@ class PaymentManager { await _db.subscriptionDao.createUserSubscription( UserSubscriptionsCompanion.insert( userId: userId, - start: now, - finish: endDate, + start: PgDateTime(now), + finish: PgDateTime(endDate), features: drift.Value(plan.features as List), ), ); @@ -149,8 +150,8 @@ class PaymentManager { await _db.subscriptionDao.createUserSubscription( UserSubscriptionsCompanion.insert( userId: payment.userId, - start: now, - finish: endDate, + start: PgDateTime(now), + finish: PgDateTime(endDate), features: drift.Value(plan.features), ), ); diff --git a/mnemo_cards_backend/lib/api/subscription/subscription_manager.dart b/mnemo_cards_backend/lib/api/subscription/subscription_manager.dart index 5e89b8e..bc887ca 100644 --- a/mnemo_cards_backend/lib/api/subscription/subscription_manager.dart +++ b/mnemo_cards_backend/lib/api/subscription/subscription_manager.dart @@ -1,3 +1,4 @@ +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:mnemo_cards_common_backend/mnemo_cards_common_backend.dart'; @@ -25,8 +26,8 @@ class SubscriptionManager { return SubscriptionDto( page: null, isActive: subscription != null, - start: subscription?.start, - finish: subscription?.finish, + start: subscription?.start.dateTime, + finish: subscription?.finish.dateTime, ); } @@ -41,8 +42,8 @@ class SubscriptionManager { await _db.subscriptionDao.createUserSubscription( UserSubscriptionsCompanion.insert( userId: user.id!, - start: now, - finish: endDate, + start: PgDateTime(now), + finish: PgDateTime(endDate), features: const Value([]), ), ); @@ -86,8 +87,8 @@ class SubscriptionManager { await _db.subscriptionDao.createUserSubscription( UserSubscriptionsCompanion.insert( userId: userId, - start: now, - finish: endDate, + start: PgDateTime(now), + finish: PgDateTime(endDate), features: Value(plan.features as List), ), ); diff --git a/mnemo_cards_backend/lib/api/v2/admin_analytics_api_v2.dart b/mnemo_cards_backend/lib/api/v2/admin_analytics_api_v2.dart index 67c0a72..0c63f34 100644 --- a/mnemo_cards_backend/lib/api/v2/admin_analytics_api_v2.dart +++ b/mnemo_cards_backend/lib/api/v2/admin_analytics_api_v2.dart @@ -71,7 +71,7 @@ class AdminAnalyticsApiV2 { 'id': u.id, 'name': u.name, 'email': u.email, - 'createdAt': u.createdAt.toIso8601String(), + 'createdAt': u.createdAt.dateTime.toIso8601String(), }) .toList(); diff --git a/mnemo_cards_backend/lib/api/v2/admin_cards_api_v2.dart b/mnemo_cards_backend/lib/api/v2/admin_cards_api_v2.dart index 6946b4e..5d7d027 100644 --- a/mnemo_cards_backend/lib/api/v2/admin_cards_api_v2.dart +++ b/mnemo_cards_backend/lib/api/v2/admin_cards_api_v2.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:convert'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:shelf/shelf.dart'; import 'package:shelf_router/shelf_router.dart'; import 'package:mnemo_cards_backend/database/database.dart'; @@ -41,9 +42,9 @@ class AdminCardsApiV2 { 'image': card.image, 'back': card.back, 'transcription': card.transcription, - 'createdAt': card.createdAt.toIso8601String(), + 'createdAt': card.createdAt.dateTime.toIso8601String(), }).toList(), - 'total': total, + 'total': total, }), headers: {'Content-Type': 'application/json'}, ); @@ -83,8 +84,8 @@ class AdminCardsApiV2 { 'image': card.image, 'back': card.back, 'transcription': card.transcription, - 'createdAt': card.createdAt.toIso8601String(), - 'updatedAt': card.updatedAt?.toIso8601String(), + 'createdAt': card.createdAt.dateTime.toIso8601String(), + 'updatedAt': card.updatedAt?.dateTime.toIso8601String(), }), headers: {'Content-Type': 'application/json'}, ); @@ -155,7 +156,7 @@ class AdminCardsApiV2 { image: data['image'] ?? existing.image, back: data['back'] ?? existing.back, transcription: data['transcription'] ?? existing.transcription, - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), ); await _db.packDao.updateCard(updated); diff --git a/mnemo_cards_backend/lib/api/v2/jwt_service.dart b/mnemo_cards_backend/lib/api/v2/jwt_service.dart index 58d5c79..5eb411e 100644 --- a/mnemo_cards_backend/lib/api/v2/jwt_service.dart +++ b/mnemo_cards_backend/lib/api/v2/jwt_service.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'dart:math'; import 'package:crypto/crypto.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:mnemo_cards_common_backend/mnemo_cards_common_backend.dart'; @@ -245,7 +246,7 @@ class JwtService { RefreshTokensCompanion.insert( jti: jti, userId: userId, - expiresAt: expiresAt, // required field - raw DateTime + expiresAt: PgDateTime(expiresAt), // required field - raw DateTime // createdAt and isBlacklisted use defaults from table ), ); @@ -260,7 +261,7 @@ class JwtService { } // Check if expired - if (token.expiresAt.isBefore(DateTime.now())) { + if (token.expiresAt.dateTime.isBefore(DateTime.now())) { return true; // Expired tokens are considered invalid } diff --git a/mnemo_cards_backend/lib/api/v2/tasks_api_v2.dart b/mnemo_cards_backend/lib/api/v2/tasks_api_v2.dart index 1ca319e..7dabad5 100644 --- a/mnemo_cards_backend/lib/api/v2/tasks_api_v2.dart +++ b/mnemo_cards_backend/lib/api/v2/tasks_api_v2.dart @@ -4,7 +4,6 @@ import 'dart:developer'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/api/authorize/helpers.dart'; import 'package:mnemo_cards_backend/tasks/task_manager.dart'; -import 'package:mnemo_cards_common_backend/mnemo_cards_common_backend.dart'; import 'package:shelf/shelf.dart'; import 'package:shelf_router/shelf_router.dart'; @@ -104,9 +103,9 @@ class TasksApiV2 { 'difficulty': t.difficulty, 'status': t.status, 'rewards': t.rewards, - 'createdAt': t.createdAt.toIso8601String(), - 'expiresAt': t.expiresAt.toIso8601String(), - 'completedAt': t.completedAt?.toIso8601String(), + 'createdAt': t.createdAt.dateTime.toIso8601String(), + 'expiresAt': t.expiresAt.dateTime.toIso8601String(), + 'completedAt': t.completedAt?.dateTime.toIso8601String(), 'proofUrl': t.proofUrl, 'instructions': t.instructions, 'tags': t.tags, @@ -146,9 +145,9 @@ class TasksApiV2 { 'difficulty': task.difficulty, 'status': task.status, 'rewards': task.rewards, - 'createdAt': task.createdAt.toIso8601String(), - 'expiresAt': task.expiresAt.toIso8601String(), - 'completedAt': task.completedAt?.toIso8601String(), + 'createdAt': task.createdAt.dateTime.toIso8601String(), + 'expiresAt': task.expiresAt.dateTime.toIso8601String(), + 'completedAt': task.completedAt?.dateTime.toIso8601String(), 'proofUrl': task.proofUrl, 'instructions': task.instructions, 'tags': task.tags, @@ -212,8 +211,8 @@ class TasksApiV2 { 'progress': progress.map((p) => { 'taskId': p.taskId, 'progress': p.progress, - 'startedAt': p.startedAt.toIso8601String(), - 'updatedAt': p.updatedAt.toIso8601String(), + 'startedAt': p.startedAt.dateTime.toIso8601String(), + 'updatedAt': p.updatedAt.dateTime.toIso8601String(), }).toList() }); } catch (e) { diff --git a/mnemo_cards_backend/lib/api/v2/telegram_bot_api_v2.dart b/mnemo_cards_backend/lib/api/v2/telegram_bot_api_v2.dart index bff707c..9284880 100644 --- a/mnemo_cards_backend/lib/api/v2/telegram_bot_api_v2.dart +++ b/mnemo_cards_backend/lib/api/v2/telegram_bot_api_v2.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:math'; import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:mnemo_cards_backend/main.dart' as backend_main; @@ -115,8 +116,8 @@ class TelegramBotApiV2 { final sharesCount = await (_db.selectOnly(_db.shareRequests) ..addColumns([countExpr]) ..where(_db.shareRequests.telegramUserId.equals(telegramUserId)) - ..where(_db.shareRequests.requestedAt.isBiggerOrEqualValue(todayStart)) - ..where(_db.shareRequests.requestedAt.isSmallerThanValue(todayEnd))) + ..where(_db.shareRequests.requestedAt.isBiggerOrEqualValue(PgDateTime(todayStart))) + ..where(_db.shareRequests.requestedAt.isSmallerThanValue(PgDateTime(todayEnd)))) .map((row) => row.read(countExpr)!) .getSingle(); @@ -155,7 +156,7 @@ class TelegramBotApiV2 { telegramUserId: telegramUserId, telegramUsername: Value(telegramUsername), sharedCardId: Value(sharedCardId), - requestedAt: Value(requestedAt), + requestedAt: Value(PgDateTime(requestedAt)), ); await _db.into(_db.shareRequests).insert(companion); diff --git a/mnemo_cards_backend/lib/api/v2/users_api_v2.dart b/mnemo_cards_backend/lib/api/v2/users_api_v2.dart index 1d05dd9..db89827 100644 --- a/mnemo_cards_backend/lib/api/v2/users_api_v2.dart +++ b/mnemo_cards_backend/lib/api/v2/users_api_v2.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:math'; import 'package:drift/drift.dart' as drift; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/api/authorize/helpers.dart'; import 'package:mnemo_cards_backend/api/purchase/payment_manager.dart'; @@ -117,7 +118,7 @@ class UsersApiV2 { id: drift.Value(user.id!), name: name != null ? drift.Value(name) : const drift.Value.absent(), email: email != null ? drift.Value(email) : const drift.Value.absent(), - updatedAt: drift.Value(DateTime.now()), + updatedAt: drift.Value(PgDateTime(DateTime.now())), ), ); @@ -518,8 +519,8 @@ class UsersApiV2 { totalStudyTimeMinutes: drift.Value(totalStudyTime), currentStreak: drift.Value(currentStreak), longestStreak: drift.Value(longestStreak), - lastTimeOnline: drift.Value(now), - updatedAt: drift.Value(now), + lastTimeOnline: drift.Value(PgDateTime(now)), + updatedAt: drift.Value(PgDateTime(now)), ), ); }); diff --git a/mnemo_cards_backend/lib/cron/check_admins.dart b/mnemo_cards_backend/lib/cron/check_admins.dart index 7d631fd..d5d7436 100644 --- a/mnemo_cards_backend/lib/cron/check_admins.dart +++ b/mnemo_cards_backend/lib/cron/check_admins.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:mnemo_cards_backend/user/admin_ids_service.dart'; import '../database/database.dart'; @@ -41,7 +42,7 @@ class CheckAdminsTask with task.Task { UsersCompanion( id: Value(user.id), admin: const Value(true), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), ), ); } diff --git a/mnemo_cards_backend/lib/cron/tasks_seeder.dart b/mnemo_cards_backend/lib/cron/tasks_seeder.dart index 0f215f5..c4234b4 100644 --- a/mnemo_cards_backend/lib/cron/tasks_seeder.dart +++ b/mnemo_cards_backend/lib/cron/tasks_seeder.dart @@ -1,6 +1,8 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:mnemo_cards_backend/cron/task.dart' as cron_task; import 'package:mnemo_cards_backend/database/database.dart'; +import 'package:mnemo_cards_common/mnemo_cards_common.dart'; import 'package:mnemo_cards_common_backend/mnemo_cards_common_backend.dart'; class TasksSeederTask with cron_task.Task { @@ -19,10 +21,13 @@ class TasksSeederTask with cron_task.Task { final now = DateTime.now(); final weekFromNow = now.add(const Duration(days: 7)); - final tasks = [ - // App Internal Tasks - UserTaskModel( - title: 'Пройди 3 теста сегодня', + // Используем предопределенные UUID для каждой задачи + // Это позволяет избежать дубликатов при повторных запусках + final tasksWithIds = [ + ( + id: '00000000-0000-0000-0001-000000000001', + task: UserTaskModel( + title: 'Пройди 3 теста сегодня', description: 'Заверши три тестовые сессии в приложении для улучшения навыков испанского.', type: 'app_internal', @@ -36,9 +41,11 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['tests', 'practice', 'daily'], ), - - UserTaskModel( - title: 'Достигни 80% правильных ответов в тесте', + ), + ( + id: '00000000-0000-0000-0001-000000000002', + task: UserTaskModel( + title: 'Достигни 80% правильных ответов в тесте', description: 'Пройди тест с результатом не менее 80% правильных ответов.', type: 'app_internal', @@ -52,10 +59,12 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['tests', 'accuracy', 'challenge'], ), - + ), // External Tasks - UserTaskModel( - title: 'Подпишись на Telegram канал', + ( + id: '00000000-0000-0000-0001-000000000003', + task: UserTaskModel( + title: 'Подпишись на Telegram канал', description: 'Подпишись на наш Telegram канал @mnemo_cards для получения обновлений и советов по изучению испанского.', type: 'external', @@ -69,9 +78,11 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['telegram', 'social', 'subscription'], ), - - UserTaskModel( - title: 'Закажи еду на испанском', + ), + ( + id: '00000000-0000-0000-0001-000000000004', + task: UserTaskModel( + title: 'Закажи еду на испанском', description: 'Сделай заказ в ресторане или кафе, используя испанский язык. Запиши процесс на видео для подтверждения.', type: 'external', @@ -91,9 +102,11 @@ class TasksSeederTask with cron_task.Task { 'Запиши видео, где ты делаешь заказ на испанском. Убедись, что официант понимает тебя.', tags: ['speaking', 'restaurant', 'video', 'real_world'], ), - - UserTaskModel( - title: 'Посмотри испанский фильм с субтитрами', + ), + ( + id: '00000000-0000-0000-0001-000000000005', + task: UserTaskModel( + title: 'Посмотри испанский фильм с субтитрами', description: 'Посмотри испанский фильм или сериал с испанскими субтитрами в течение 30 минут.', type: 'external', @@ -107,10 +120,12 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['listening', 'media', 'subtitles'], ), - + ), // Social Tasks - UserTaskModel( - title: 'Поделись прогрессом в соцсетях', + ( + id: '00000000-0000-0000-0001-000000000006', + task: UserTaskModel( + title: 'Поделись прогрессом в соцсетях', description: 'Поделись своим прогрессом в изучении испанского в социальных сетях с хэштегом #MnemoCards.', type: 'social', @@ -124,9 +139,11 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['social', 'sharing', 'progress'], ), - - UserTaskModel( - title: 'Найди партнёра для практики', + ), + ( + id: '00000000-0000-0000-0001-000000000007', + task: UserTaskModel( + title: 'Найди партнёра для практики', description: 'Найди собеседника для практики испанского языка (друга, коллегу или через языковые приложения).', type: 'social', @@ -140,10 +157,12 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow.add(const Duration(days: 7)), // 2 weeks tags: ['conversation', 'partner', 'practice'], ), - + ), // Additional App Tasks - UserTaskModel( - title: 'Изучай слова ежедневно 7 дней подряд', + ( + id: '00000000-0000-0000-0001-000000000008', + task: UserTaskModel( + title: 'Изучай слова ежедневно 7 дней подряд', description: 'Учи новые слова в приложении каждый день в течение недели.', type: 'app_internal', @@ -161,9 +180,11 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow.add(const Duration(days: 21)), // 4 weeks tags: ['vocabulary', 'daily', 'streak', 'consistency'], ), - - UserTaskModel( - title: 'Пройди тест по грамматике', + ), + ( + id: '00000000-0000-0000-0001-000000000009', + task: UserTaskModel( + title: 'Пройди тест по грамматике', description: 'Заверши специализированный тест по грамматике испанского языка.', type: 'app_internal', @@ -177,9 +198,11 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['grammar', 'tests', 'knowledge'], ), - - UserTaskModel( - title: 'Практикуй произношение', + ), + ( + id: '00000000-0000-0000-0001-000000000010', + task: UserTaskModel( + title: 'Практикуй произношение', description: 'Заверши урок по произношению или запиши себя, читая текст на испанском.', type: 'app_internal', @@ -193,24 +216,28 @@ class TasksSeederTask with cron_task.Task { expiresAt: weekFromNow, tags: ['pronunciation', 'speaking', 'practice'], ), + ), ]; // Convert UserTaskModel to UserTasksCompanion and insert - // Используем InsertMode.insertOrIgnore для автоматического игнорирования дубликатов через ON CONFLICT - for (final taskModel in tasks) { + // PostgreSQL автоматически генерирует UUID через DEFAULT gen_random_uuid() + // Используем InsertMode.insertOrIgnore с предопределенными UUID для идемпотентности + for (final taskData in tasksWithIds) { + final taskModel = taskData.task; final rewardsJson = taskModel.rewards.map((r) => r.toJson()).toList(); await _db.into(_db.userTasks).insert( UserTasksCompanion.insert( + id: Value(taskData.id), // Предопределенный UUID для идемпотентности seeder'а title: taskModel.title, description: taskModel.description, type: taskModel.type, difficulty: taskModel.difficulty, status: taskModel.status, rewards: Value(rewardsJson), - createdAt: Value(taskModel.createdAt), - expiresAt: taskModel.expiresAt, - completedAt: Value(taskModel.completedAt), + createdAt: Value(PgDateTime(taskModel.createdAt)), + expiresAt: PgDateTime(taskModel.expiresAt), + completedAt: Value(taskModel.completedAt?.let(PgDateTime.new)), proofUrl: Value(taskModel.proofUrl), instructions: Value(taskModel.instructions), tags: Value(taskModel.tags), @@ -220,7 +247,7 @@ class TasksSeederTask with cron_task.Task { ); } - print('Successfully seeded ${tasks.length} user tasks (duplicates ignored)'); + print('Successfully seeded ${tasksWithIds.length} user tasks (duplicates ignored)'); } catch (e) { print('Error seeding tasks: $e'); rethrow; diff --git a/mnemo_cards_backend/lib/database/daos/achievement_dao.dart b/mnemo_cards_backend/lib/database/daos/achievement_dao.dart index 7745c95..c69ed76 100644 --- a/mnemo_cards_backend/lib/database/daos/achievement_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/achievement_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/achievements.dart'; @@ -45,7 +46,7 @@ class AchievementDao extends DatabaseAccessor with _$AchievementDao ..where((ua) => ua.userId.equals(userId) & ua.achievementId.equals(achievementId)) ).write(UserAchievementsCompanion( progress: Value(progress), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); return count > 0; } diff --git a/mnemo_cards_backend/lib/database/daos/discount_dao.dart b/mnemo_cards_backend/lib/database/daos/discount_dao.dart index 153f396..631f2ee 100644 --- a/mnemo_cards_backend/lib/database/daos/discount_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/discount_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/discounts.dart'; import '../tables/users.dart'; @@ -18,7 +19,7 @@ class DiscountDao extends DatabaseAccessor with _$DiscountDaoMixin /// Получить все активные кампании Future> getActiveCampaigns() { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); return (select(db.discountCampaigns) ..where((c) => c.status.equals('active')) ..where((c) => c.start.isSmallerOrEqualValue(now)) @@ -44,7 +45,7 @@ class DiscountDao extends DatabaseAccessor with _$DiscountDaoMixin ..where((c) => c.id.equals(campaignId)) ).write(DiscountCampaignsCompanion( status: Value(status), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } @@ -77,7 +78,7 @@ class DiscountDao extends DatabaseAccessor with _$DiscountDaoMixin ..where((c) => c.id.equals(campaignId)) ).write(DiscountCampaignsCompanion( isDeleted: const Value(true), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } @@ -171,7 +172,7 @@ class DiscountDao extends DatabaseAccessor with _$DiscountDaoMixin String? productType, String? productId, }) async { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); final query = select(db.discountCampaigns) ..where((c) => c.status.equals('active')) ..where((c) => c.start.isSmallerOrEqualValue(now)) diff --git a/mnemo_cards_backend/lib/database/daos/pack_dao.dart b/mnemo_cards_backend/lib/database/daos/pack_dao.dart index 4ad52a7..93e9365 100644 --- a/mnemo_cards_backend/lib/database/daos/pack_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/pack_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/packs.dart'; import '../tables/relations.dart'; @@ -60,7 +61,7 @@ class PackDao extends DatabaseAccessor with _$PackDaoMixin { if (packId == null) throw ArgumentError('Pack ID is required'); return (update(cardPacks)..where((p) => p.id.equals(packId))) - .write(updates.copyWith(updatedAt: Value(DateTime.now()))); + .write(updates.copyWith(updatedAt: Value(PgDateTime(DateTime.now())))); } /// Удалить пак (soft delete) @@ -68,7 +69,7 @@ class PackDao extends DatabaseAccessor with _$PackDaoMixin { return (update(cardPacks)..where((p) => p.id.equals(packId))) .write(CardPacksCompanion( isDeleted: const Value(true), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } @@ -137,7 +138,7 @@ class PackDao extends DatabaseAccessor with _$PackDaoMixin { return (update(gameCards)..where((c) => c.id.equals(cardId))) .write(GameCardsCompanion( isDeleted: const Value(true), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } diff --git a/mnemo_cards_backend/lib/database/daos/payment_dao.dart b/mnemo_cards_backend/lib/database/daos/payment_dao.dart index f13ae2d..e1b5777 100644 --- a/mnemo_cards_backend/lib/database/daos/payment_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/payment_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/payments.dart'; @@ -56,7 +57,7 @@ class PaymentDao extends DatabaseAccessor with _$PaymentDaoMixin { 'SELECT id FROM payments WHERE user_id = ? AND date = ? AND amount = ? ORDER BY created_at DESC LIMIT 1', variables: [ Variable.withString(payment.userId.value), - Variable.withDateTime(inserted.date), + Variable.withDateTime(inserted.date.dateTime), Variable.withString(inserted.amount), ], readsFrom: {payments}, @@ -81,7 +82,7 @@ class PaymentDao extends DatabaseAccessor with _$PaymentDaoMixin { return (update(payments)..where((p) => p.id.equals(paymentId))) .write(PaymentsCompanion( status: Value(status), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } diff --git a/mnemo_cards_backend/lib/database/daos/promo_code_dao.dart b/mnemo_cards_backend/lib/database/daos/promo_code_dao.dart index 810ec2f..fa4206c 100644 --- a/mnemo_cards_backend/lib/database/daos/promo_code_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/promo_code_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/promo_codes.dart'; import '../tables/users.dart'; @@ -18,7 +19,7 @@ class PromoCodeDao extends DatabaseAccessor with _$PromoCodeDaoMixi /// Получить все активные кампании Future> getActiveCampaigns() { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); return (select(db.promoCodesCampaigns) ..where((c) => c.status.equals('active')) ..where((c) => c.start.isSmallerOrEqualValue(now)) @@ -44,7 +45,7 @@ class PromoCodeDao extends DatabaseAccessor with _$PromoCodeDaoMixi ..where((c) => c.id.equals(campaignId)) ).write(PromoCodesCampaignsCompanion( status: Value(status), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } @@ -109,7 +110,7 @@ class PromoCodeDao extends DatabaseAccessor with _$PromoCodeDaoMixi if (code != null) { await update(db.promoCodes).replace(code.copyWith( activations: code.activations + 1, - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), )); } } diff --git a/mnemo_cards_backend/lib/database/daos/statistics_dao.dart b/mnemo_cards_backend/lib/database/daos/statistics_dao.dart index 97b934d..946357a 100644 --- a/mnemo_cards_backend/lib/database/daos/statistics_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/statistics_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/statistics.dart'; import '../tables/users.dart'; @@ -42,10 +43,10 @@ class StatisticsDao extends DatabaseAccessor with _$StatisticsDaoMi ..orderBy([(s) => OrderingTerm.desc(s.startTime)]); if (fromDate != null) { - query.where((s) => s.startTime.isBiggerOrEqualValue(fromDate)); + query.where((s) => s.startTime.isBiggerOrEqualValue(PgDateTime(fromDate))); } if (toDate != null) { - query.where((s) => s.startTime.isSmallerOrEqualValue(toDate)); + query.where((s) => s.startTime.isSmallerOrEqualValue(PgDateTime(toDate))); } if (limit != null) { @@ -74,8 +75,8 @@ class StatisticsDao extends DatabaseAccessor with _$StatisticsDaoMi }) { final updates = StudySessionsCompanion( id: Value(sessionId), - endTime: Value(DateTime.now()), - updatedAt: Value(DateTime.now()), + endTime: Value(PgDateTime(DateTime.now())), + updatedAt: Value(PgDateTime(DateTime.now())), wordsLearned: wordsLearned != null ? Value(wordsLearned) : const Value.absent(), testsCompleted: testsCompleted != null ? Value(testsCompleted) : const Value.absent(), accuracy: accuracy != null ? Value(accuracy) : const Value.absent(), diff --git a/mnemo_cards_backend/lib/database/daos/subscription_dao.dart b/mnemo_cards_backend/lib/database/daos/subscription_dao.dart index dd7eb59..ac25405 100644 --- a/mnemo_cards_backend/lib/database/daos/subscription_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/subscription_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/subscriptions.dart'; import '../tables/users.dart'; @@ -46,7 +47,7 @@ class SubscriptionDao extends DatabaseAccessor with _$SubscriptionD /// Получить активную подписку пользователя Future getActiveSubscription(String userId) async { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); return (select(userSubscriptions) ..where((us) => us.userId.equals(userId)) ..where((us) => us.start.isSmallerThanValue(now)) @@ -81,7 +82,7 @@ class SubscriptionDao extends DatabaseAccessor with _$SubscriptionD /// Получить всех пользователей с активными подписками Future> getActiveSubscriptions() async { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); return (select(userSubscriptions) ..where((us) => us.start.isSmallerThanValue(now)) ..where((us) => us.finish.isBiggerThanValue(now)) @@ -100,7 +101,7 @@ class SubscriptionDao extends DatabaseAccessor with _$SubscriptionD if (subscription != null) { await update(userSubscriptions).replace( subscription.copyWith( - finish: DateTime.now(), + finish: PgDateTime(DateTime.now()), ), ); } diff --git a/mnemo_cards_backend/lib/database/daos/task_dao.dart b/mnemo_cards_backend/lib/database/daos/task_dao.dart index 56fc82e..e5f679d 100644 --- a/mnemo_cards_backend/lib/database/daos/task_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/task_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; part 'task_dao.g.dart'; @@ -32,10 +33,11 @@ class TaskDao extends DatabaseAccessor with _$TaskDaoMixin { /// Обновить время последнего выполнения Future updateLastExecution(String taskId) { + final now = PgDateTime(DateTime.now()); return (update(db.tasks)..where((t) => t.id.equals(taskId))) .write(TasksCompanion( - lastExecution: Value(DateTime.now()), - updatedAt: Value(DateTime.now()), + lastExecution: Value(now), + updatedAt: Value(now), )); } @@ -66,7 +68,7 @@ class TaskDao extends DatabaseAccessor with _$TaskDaoMixin { } if (activeOnly) { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); query.where((ut) => ut.expiresAt.isBiggerThanValue(now)); } @@ -88,11 +90,12 @@ class TaskDao extends DatabaseAccessor with _$TaskDaoMixin { /// Завершить задачу пользователя Future completeUserTask(String taskId) { + final now = PgDateTime(DateTime.now()); return (update(db.userTasks)..where((ut) => ut.id.equals(taskId))) .write(UserTasksCompanion( status: const Value('completed'), - completedAt: Value(DateTime.now()), - updatedAt: Value(DateTime.now()), + completedAt: Value(now), + updatedAt: Value(now), )); } diff --git a/mnemo_cards_backend/lib/database/daos/test_dao.dart b/mnemo_cards_backend/lib/database/daos/test_dao.dart index 24996d1..1fcfa70 100644 --- a/mnemo_cards_backend/lib/database/daos/test_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/test_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/tests.dart'; import '../tables/packs.dart'; @@ -52,7 +53,7 @@ class TestDao extends DatabaseAccessor with _$TestDaoMixin { return (update(tests)..where((t) => t.id.equals(testId))) .write(TestsCompanion( isDeleted: const Value(true), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } diff --git a/mnemo_cards_backend/lib/database/daos/user_dao.dart b/mnemo_cards_backend/lib/database/daos/user_dao.dart index ab61a7d..9dc6cbb 100644 --- a/mnemo_cards_backend/lib/database/daos/user_dao.dart +++ b/mnemo_cards_backend/lib/database/daos/user_dao.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../database.dart'; import '../tables/users.dart'; import '../tables/auth.dart'; @@ -82,7 +83,7 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { return (update(users)..where((u) => u.id.equals(userId))) .write(UsersCompanion( isDeleted: const Value(true), - updatedAt: Value(DateTime.now()), + updatedAt: Value(PgDateTime(DateTime.now())), )); } @@ -115,7 +116,7 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { /// Получить пользователей с активной подпиской Stream> watchUsersWithActiveSubscription() { - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); final query = select(users).join([ innerJoin( db.userSubscriptions, @@ -155,15 +156,16 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { if (userId == null) throw ArgumentError('User ID is required'); return (update(userDatas)..where((ud) => ud.userId.equals(userId))) - .write(updates.copyWith(updatedAt: Value(DateTime.now()))); + .write(updates.copyWith(updatedAt: Value(PgDateTime(DateTime.now())))); } /// Обновить время последнего визита Future updateLastOnline(String userId) async { + final now = PgDateTime(DateTime.now()); await (update(userDatas)..where((ud) => ud.userId.equals(userId))) .write(UserDatasCompanion( - lastTimeOnline: Value(DateTime.now()), - updatedAt: Value(DateTime.now()), + lastTimeOnline: Value(now), + updatedAt: Value(now), )); } @@ -188,7 +190,7 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { Future getTokenByUserId(String userId) { return (select(tokens) ..where((t) => t.userId.equals(userId)) - ..where((t) => t.expires.isBiggerThanValue(DateTime.now())) + ..where((t) => t.expires.isBiggerThanValue(PgDateTime(DateTime.now()))) ..orderBy([(t) => OrderingTerm.desc(t.created)]) ).getSingleOrNull(); } @@ -212,7 +214,7 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { /// Удалить истекшие токены Future deleteExpiredTokens() { return (delete(tokens) - ..where((t) => t.expires.isSmallerThanValue(DateTime.now())) + ..where((t) => t.expires.isSmallerThanValue(PgDateTime(DateTime.now()))) ).go(); } @@ -229,7 +231,7 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { return (select(refreshTokens) ..where((rt) => rt.userId.equals(userId)) ..where((rt) => rt.isBlacklisted.equals(false)) - ..where((rt) => rt.expiresAt.isBiggerThanValue(DateTime.now())) + ..where((rt) => rt.expiresAt.isBiggerThanValue(PgDateTime(DateTime.now()))) ..orderBy([(rt) => OrderingTerm.desc(rt.createdAt)]) ).get(); } @@ -259,7 +261,7 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { /// Удалить истекшие refresh токены Future deleteExpiredRefreshTokens() { return (delete(refreshTokens) - ..where((rt) => rt.expiresAt.isSmallerThanValue(DateTime.now())) + ..where((rt) => rt.expiresAt.isSmallerThanValue(PgDateTime(DateTime.now()))) ).go(); } @@ -282,14 +284,14 @@ class UserDao extends DatabaseAccessor with _$UserDaoMixin { return (update(db.telegramAuthCodes)..where((ac) => ac.code.equals(code))) .write(TelegramAuthCodesCompanion( isUsed: const Value(true), - usedAt: Value(DateTime.now()), + usedAt: Value(PgDateTime(DateTime.now())), )); } /// Удалить истекшие коды Future deleteExpiredAuthCodes() { return (delete(db.telegramAuthCodes) - ..where((ac) => ac.expiresAt.isSmallerThanValue(DateTime.now())) + ..where((ac) => ac.expiresAt.isSmallerThanValue(PgDateTime(DateTime.now()))) ).go(); } diff --git a/mnemo_cards_backend/lib/database/database.dart b/mnemo_cards_backend/lib/database/database.dart index a41f4a8..c387660 100644 --- a/mnemo_cards_backend/lib/database/database.dart +++ b/mnemo_cards_backend/lib/database/database.dart @@ -32,7 +32,6 @@ import 'daos/promo_code_dao.dart'; import 'daos/discount_dao.dart'; import 'daos/statistics_dao.dart'; import 'daos/achievement_dao.dart'; -import 'postgres_constants.dart'; // Сгенерированный код будет здесь part 'database.g.dart'; diff --git a/mnemo_cards_backend/lib/database/database.g.dart b/mnemo_cards_backend/lib/database/database.g.dart index bc50e25..65b9f74 100644 --- a/mnemo_cards_backend/lib/database/database.g.dart +++ b/mnemo_cards_backend/lib/database/database.g.dart @@ -16,7 +16,7 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> { false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _externalUserIdMeta = const VerificationMeta( 'externalUserId', @@ -84,26 +84,28 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> { 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -241,11 +243,11 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> { )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -272,8 +274,8 @@ class User extends DataClass implements Insertable { final bool admin; final String? userSettings; final List purchases; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const User({ required this.id, @@ -307,8 +309,14 @@ class User extends DataClass implements Insertable { $UsersTable.$converterpurchases.toSql(purchases), ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -345,8 +353,8 @@ class User extends DataClass implements Insertable { admin: serializer.fromJson(json['admin']), userSettings: serializer.fromJson(json['userSettings']), purchases: serializer.fromJson>(json['purchases']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -361,8 +369,8 @@ class User extends DataClass implements Insertable { 'admin': serializer.toJson(admin), 'userSettings': serializer.toJson(userSettings), 'purchases': serializer.toJson>(purchases), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -375,8 +383,8 @@ class User extends DataClass implements Insertable { bool? admin, Value userSettings = const Value.absent(), List? purchases, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => User( id: id ?? this.id, @@ -463,8 +471,8 @@ class UsersCompanion extends UpdateCompanion { final Value admin; final Value userSettings; final Value> purchases; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const UsersCompanion({ @@ -501,8 +509,8 @@ class UsersCompanion extends UpdateCompanion { Expression? admin, Expression? userSettings, Expression? purchases, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -529,8 +537,8 @@ class UsersCompanion extends UpdateCompanion { Value? admin, Value? userSettings, Value>? purchases, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -576,10 +584,16 @@ class UsersCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -623,7 +637,7 @@ class $UserDatasTable extends UserDatas false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -700,26 +714,26 @@ class $UserDatasTable extends UserDatas 'lastTimeOnline', ); @override - late final GeneratedColumn lastTimeOnline = - GeneratedColumn( + late final GeneratedColumn lastTimeOnline = + GeneratedColumn( 'last_time_online', aliasedName, true, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, ); static const VerificationMeta _registrationDateMeta = const VerificationMeta( 'registrationDate', ); @override - late final GeneratedColumn registrationDate = - GeneratedColumn( + late final GeneratedColumn registrationDate = + GeneratedColumn( 'registration_date', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, - defaultValue: currentTimestamp, + defaultValue: now(), ); static const VerificationMeta _lastTestSessionTokenMeta = const VerificationMeta('lastTestSessionToken'); @@ -799,26 +813,28 @@ class $UserDatasTable extends UserDatas 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -979,11 +995,11 @@ class $UserDatasTable extends UserDatas data['${effectivePrefix}total_tests'], )!, lastTimeOnline: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}last_time_online'], ), registrationDate: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}registration_date'], )!, lastTestSessionToken: attachedDatabase.typeMapping.read( @@ -1027,11 +1043,11 @@ class $UserDatasTable extends UserDatas )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -1064,8 +1080,8 @@ class UserData extends DataClass implements Insertable { final int longestStreak; final int totalCards; final int totalTests; - final DateTime? lastTimeOnline; - final DateTime registrationDate; + final PgDateTime? lastTimeOnline; + final PgDateTime registrationDate; final String? lastTestSessionToken; final List words; final List tags; @@ -1073,8 +1089,8 @@ class UserData extends DataClass implements Insertable { final List? studyDates; final List achievements; final Map? categoryMinutes; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const UserData({ required this.id, required this.userId, @@ -1106,9 +1122,15 @@ class UserData extends DataClass implements Insertable { map['total_cards'] = Variable(totalCards); map['total_tests'] = Variable(totalTests); if (!nullToAbsent || lastTimeOnline != null) { - map['last_time_online'] = Variable(lastTimeOnline); + map['last_time_online'] = Variable( + lastTimeOnline, + PgTypes.timestampWithTimezone, + ); } - map['registration_date'] = Variable(registrationDate); + map['registration_date'] = Variable( + registrationDate, + PgTypes.timestampWithTimezone, + ); if (!nullToAbsent || lastTestSessionToken != null) { map['last_test_session_token'] = Variable(lastTestSessionToken); } @@ -1142,8 +1164,14 @@ class UserData extends DataClass implements Insertable { $UserDatasTable.$convertercategoryMinutes.toSql(categoryMinutes), ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -1193,8 +1221,10 @@ class UserData extends DataClass implements Insertable { longestStreak: serializer.fromJson(json['longestStreak']), totalCards: serializer.fromJson(json['totalCards']), totalTests: serializer.fromJson(json['totalTests']), - lastTimeOnline: serializer.fromJson(json['lastTimeOnline']), - registrationDate: serializer.fromJson(json['registrationDate']), + lastTimeOnline: serializer.fromJson(json['lastTimeOnline']), + registrationDate: serializer.fromJson( + json['registrationDate'], + ), lastTestSessionToken: serializer.fromJson( json['lastTestSessionToken'], ), @@ -1206,8 +1236,8 @@ class UserData extends DataClass implements Insertable { categoryMinutes: serializer.fromJson?>( json['categoryMinutes'], ), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -1221,8 +1251,8 @@ class UserData extends DataClass implements Insertable { 'longestStreak': serializer.toJson(longestStreak), 'totalCards': serializer.toJson(totalCards), 'totalTests': serializer.toJson(totalTests), - 'lastTimeOnline': serializer.toJson(lastTimeOnline), - 'registrationDate': serializer.toJson(registrationDate), + 'lastTimeOnline': serializer.toJson(lastTimeOnline), + 'registrationDate': serializer.toJson(registrationDate), 'lastTestSessionToken': serializer.toJson(lastTestSessionToken), 'words': serializer.toJson>(words), 'tags': serializer.toJson>(tags), @@ -1232,8 +1262,8 @@ class UserData extends DataClass implements Insertable { 'categoryMinutes': serializer.toJson?>( categoryMinutes, ), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -1245,8 +1275,8 @@ class UserData extends DataClass implements Insertable { int? longestStreak, int? totalCards, int? totalTests, - Value lastTimeOnline = const Value.absent(), - DateTime? registrationDate, + Value lastTimeOnline = const Value.absent(), + PgDateTime? registrationDate, Value lastTestSessionToken = const Value.absent(), List? words, List? tags, @@ -1254,8 +1284,8 @@ class UserData extends DataClass implements Insertable { Value?> studyDates = const Value.absent(), List? achievements, Value?> categoryMinutes = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => UserData( id: id ?? this.id, userId: userId ?? this.userId, @@ -1407,8 +1437,8 @@ class UserDatasCompanion extends UpdateCompanion { final Value longestStreak; final Value totalCards; final Value totalTests; - final Value lastTimeOnline; - final Value registrationDate; + final Value lastTimeOnline; + final Value registrationDate; final Value lastTestSessionToken; final Value> words; final Value> tags; @@ -1416,8 +1446,8 @@ class UserDatasCompanion extends UpdateCompanion { final Value?> studyDates; final Value> achievements; final Value?> categoryMinutes; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const UserDatasCompanion({ this.id = const Value.absent(), @@ -1469,8 +1499,8 @@ class UserDatasCompanion extends UpdateCompanion { Expression? longestStreak, Expression? totalCards, Expression? totalTests, - Expression? lastTimeOnline, - Expression? registrationDate, + Expression? lastTimeOnline, + Expression? registrationDate, Expression? lastTestSessionToken, Expression? words, Expression? tags, @@ -1478,8 +1508,8 @@ class UserDatasCompanion extends UpdateCompanion { Expression? studyDates, Expression? achievements, Expression? categoryMinutes, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -1515,8 +1545,8 @@ class UserDatasCompanion extends UpdateCompanion { Value? longestStreak, Value? totalCards, Value? totalTests, - Value? lastTimeOnline, - Value? registrationDate, + Value? lastTimeOnline, + Value? registrationDate, Value? lastTestSessionToken, Value>? words, Value>? tags, @@ -1524,8 +1554,8 @@ class UserDatasCompanion extends UpdateCompanion { Value?>? studyDates, Value>? achievements, Value?>? categoryMinutes, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return UserDatasCompanion( @@ -1579,10 +1609,16 @@ class UserDatasCompanion extends UpdateCompanion { map['total_tests'] = Variable(totalTests.value); } if (lastTimeOnline.present) { - map['last_time_online'] = Variable(lastTimeOnline.value); + map['last_time_online'] = Variable( + lastTimeOnline.value, + PgTypes.timestampWithTimezone, + ); } if (registrationDate.present) { - map['registration_date'] = Variable(registrationDate.value); + map['registration_date'] = Variable( + registrationDate.value, + PgTypes.timestampWithTimezone, + ); } if (lastTestSessionToken.present) { map['last_test_session_token'] = Variable( @@ -1620,10 +1656,16 @@ class UserDatasCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -1671,7 +1713,7 @@ class $TokensTable extends Tokens with TableInfo<$TokensTable, Token> { false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -1710,23 +1752,23 @@ class $TokensTable extends Tokens with TableInfo<$TokensTable, Token> { 'created', ); @override - late final GeneratedColumn created = GeneratedColumn( + late final GeneratedColumn created = GeneratedColumn( 'created', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, - defaultValue: currentTimestamp, + defaultValue: now(), ); static const VerificationMeta _expiresMeta = const VerificationMeta( 'expires', ); @override - late final GeneratedColumn expires = GeneratedColumn( + late final GeneratedColumn expires = GeneratedColumn( 'expires', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); @override @@ -1820,11 +1862,11 @@ class $TokensTable extends Tokens with TableInfo<$TokensTable, Token> { data['${effectivePrefix}external_user_id'], )!, created: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created'], )!, expires: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}expires'], )!, ); @@ -1841,8 +1883,8 @@ class Token extends DataClass implements Insertable { final String userId; final String token; final String externalUserId; - final DateTime created; - final DateTime expires; + final PgDateTime created; + final PgDateTime expires; const Token({ required this.id, required this.userId, @@ -1858,8 +1900,14 @@ class Token extends DataClass implements Insertable { map['user_id'] = Variable(userId); map['token'] = Variable(token); map['external_user_id'] = Variable(externalUserId); - map['created'] = Variable(created); - map['expires'] = Variable(expires); + map['created'] = Variable( + created, + PgTypes.timestampWithTimezone, + ); + map['expires'] = Variable( + expires, + PgTypes.timestampWithTimezone, + ); return map; } @@ -1884,8 +1932,8 @@ class Token extends DataClass implements Insertable { userId: serializer.fromJson(json['userId']), token: serializer.fromJson(json['token']), externalUserId: serializer.fromJson(json['externalUserId']), - created: serializer.fromJson(json['created']), - expires: serializer.fromJson(json['expires']), + created: serializer.fromJson(json['created']), + expires: serializer.fromJson(json['expires']), ); } @override @@ -1896,8 +1944,8 @@ class Token extends DataClass implements Insertable { 'userId': serializer.toJson(userId), 'token': serializer.toJson(token), 'externalUserId': serializer.toJson(externalUserId), - 'created': serializer.toJson(created), - 'expires': serializer.toJson(expires), + 'created': serializer.toJson(created), + 'expires': serializer.toJson(expires), }; } @@ -1906,8 +1954,8 @@ class Token extends DataClass implements Insertable { String? userId, String? token, String? externalUserId, - DateTime? created, - DateTime? expires, + PgDateTime? created, + PgDateTime? expires, }) => Token( id: id ?? this.id, userId: userId ?? this.userId, @@ -1962,8 +2010,8 @@ class TokensCompanion extends UpdateCompanion { final Value userId; final Value token; final Value externalUserId; - final Value created; - final Value expires; + final Value created; + final Value expires; final Value rowid; const TokensCompanion({ this.id = const Value.absent(), @@ -1980,7 +2028,7 @@ class TokensCompanion extends UpdateCompanion { required String token, required String externalUserId, this.created = const Value.absent(), - required DateTime expires, + required PgDateTime expires, this.rowid = const Value.absent(), }) : userId = Value(userId), token = Value(token), @@ -1991,8 +2039,8 @@ class TokensCompanion extends UpdateCompanion { Expression? userId, Expression? token, Expression? externalUserId, - Expression? created, - Expression? expires, + Expression? created, + Expression? expires, Expression? rowid, }) { return RawValuesInsertable({ @@ -2011,8 +2059,8 @@ class TokensCompanion extends UpdateCompanion { Value? userId, Value? token, Value? externalUserId, - Value? created, - Value? expires, + Value? created, + Value? expires, Value? rowid, }) { return TokensCompanion( @@ -2042,10 +2090,16 @@ class TokensCompanion extends UpdateCompanion { map['external_user_id'] = Variable(externalUserId.value); } if (created.present) { - map['created'] = Variable(created.value); + map['created'] = Variable( + created.value, + PgTypes.timestampWithTimezone, + ); } if (expires.present) { - map['expires'] = Variable(expires.value); + map['expires'] = Variable( + expires.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2082,7 +2136,7 @@ class $RefreshTokensTable extends RefreshTokens false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -2123,25 +2177,27 @@ class $RefreshTokensTable extends RefreshTokens 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _expiresAtMeta = const VerificationMeta( 'expiresAt', ); @override - late final GeneratedColumn expiresAt = GeneratedColumn( - 'expires_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: true, - ); + late final GeneratedColumn expiresAt = + GeneratedColumn( + 'expires_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: true, + ); @override List get $columns => [ id, @@ -2231,11 +2287,11 @@ class $RefreshTokensTable extends RefreshTokens data['${effectivePrefix}is_blacklisted'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, expiresAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}expires_at'], )!, ); @@ -2252,8 +2308,8 @@ class RefreshToken extends DataClass implements Insertable { final String userId; final String jti; final bool isBlacklisted; - final DateTime createdAt; - final DateTime expiresAt; + final PgDateTime createdAt; + final PgDateTime expiresAt; const RefreshToken({ required this.id, required this.userId, @@ -2269,8 +2325,14 @@ class RefreshToken extends DataClass implements Insertable { map['user_id'] = Variable(userId); map['jti'] = Variable(jti); map['is_blacklisted'] = Variable(isBlacklisted); - map['created_at'] = Variable(createdAt); - map['expires_at'] = Variable(expiresAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['expires_at'] = Variable( + expiresAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -2295,8 +2357,8 @@ class RefreshToken extends DataClass implements Insertable { userId: serializer.fromJson(json['userId']), jti: serializer.fromJson(json['jti']), isBlacklisted: serializer.fromJson(json['isBlacklisted']), - createdAt: serializer.fromJson(json['createdAt']), - expiresAt: serializer.fromJson(json['expiresAt']), + createdAt: serializer.fromJson(json['createdAt']), + expiresAt: serializer.fromJson(json['expiresAt']), ); } @override @@ -2307,8 +2369,8 @@ class RefreshToken extends DataClass implements Insertable { 'userId': serializer.toJson(userId), 'jti': serializer.toJson(jti), 'isBlacklisted': serializer.toJson(isBlacklisted), - 'createdAt': serializer.toJson(createdAt), - 'expiresAt': serializer.toJson(expiresAt), + 'createdAt': serializer.toJson(createdAt), + 'expiresAt': serializer.toJson(expiresAt), }; } @@ -2317,8 +2379,8 @@ class RefreshToken extends DataClass implements Insertable { String? userId, String? jti, bool? isBlacklisted, - DateTime? createdAt, - DateTime? expiresAt, + PgDateTime? createdAt, + PgDateTime? expiresAt, }) => RefreshToken( id: id ?? this.id, userId: userId ?? this.userId, @@ -2373,8 +2435,8 @@ class RefreshTokensCompanion extends UpdateCompanion { final Value userId; final Value jti; final Value isBlacklisted; - final Value createdAt; - final Value expiresAt; + final Value createdAt; + final Value expiresAt; final Value rowid; const RefreshTokensCompanion({ this.id = const Value.absent(), @@ -2391,7 +2453,7 @@ class RefreshTokensCompanion extends UpdateCompanion { required String jti, this.isBlacklisted = const Value.absent(), this.createdAt = const Value.absent(), - required DateTime expiresAt, + required PgDateTime expiresAt, this.rowid = const Value.absent(), }) : userId = Value(userId), jti = Value(jti), @@ -2401,8 +2463,8 @@ class RefreshTokensCompanion extends UpdateCompanion { Expression? userId, Expression? jti, Expression? isBlacklisted, - Expression? createdAt, - Expression? expiresAt, + Expression? createdAt, + Expression? expiresAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -2421,8 +2483,8 @@ class RefreshTokensCompanion extends UpdateCompanion { Value? userId, Value? jti, Value? isBlacklisted, - Value? createdAt, - Value? expiresAt, + Value? createdAt, + Value? expiresAt, Value? rowid, }) { return RefreshTokensCompanion( @@ -2452,10 +2514,16 @@ class RefreshTokensCompanion extends UpdateCompanion { map['is_blacklisted'] = Variable(isBlacklisted.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (expiresAt.present) { - map['expires_at'] = Variable(expiresAt.value); + map['expires_at'] = Variable( + expiresAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2492,7 +2560,7 @@ class $TelegramAuthCodesTable extends TelegramAuthCodes false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _codeMeta = const VerificationMeta('code'); @override @@ -2561,36 +2629,38 @@ class $TelegramAuthCodesTable extends TelegramAuthCodes ); static const VerificationMeta _usedAtMeta = const VerificationMeta('usedAt'); @override - late final GeneratedColumn usedAt = GeneratedColumn( + late final GeneratedColumn usedAt = GeneratedColumn( 'used_at', aliasedName, true, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, ); static const VerificationMeta _createdAtMeta = const VerificationMeta( 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _expiresAtMeta = const VerificationMeta( 'expiresAt', ); @override - late final GeneratedColumn expiresAt = GeneratedColumn( - 'expires_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: true, - ); + late final GeneratedColumn expiresAt = + GeneratedColumn( + 'expires_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: true, + ); @override List get $columns => [ id, @@ -2723,15 +2793,15 @@ class $TelegramAuthCodesTable extends TelegramAuthCodes data['${effectivePrefix}is_used'], )!, usedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}used_at'], ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, expiresAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}expires_at'], )!, ); @@ -2752,9 +2822,9 @@ class TelegramAuthCode extends DataClass final String? firstName; final String? lastName; final bool isUsed; - final DateTime? usedAt; - final DateTime createdAt; - final DateTime expiresAt; + final PgDateTime? usedAt; + final PgDateTime createdAt; + final PgDateTime expiresAt; const TelegramAuthCode({ required this.id, required this.code, @@ -2784,10 +2854,19 @@ class TelegramAuthCode extends DataClass } map['is_used'] = Variable(isUsed); if (!nullToAbsent || usedAt != null) { - map['used_at'] = Variable(usedAt); + map['used_at'] = Variable( + usedAt, + PgTypes.timestampWithTimezone, + ); } - map['created_at'] = Variable(createdAt); - map['expires_at'] = Variable(expiresAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['expires_at'] = Variable( + expiresAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -2827,9 +2906,9 @@ class TelegramAuthCode extends DataClass firstName: serializer.fromJson(json['firstName']), lastName: serializer.fromJson(json['lastName']), isUsed: serializer.fromJson(json['isUsed']), - usedAt: serializer.fromJson(json['usedAt']), - createdAt: serializer.fromJson(json['createdAt']), - expiresAt: serializer.fromJson(json['expiresAt']), + usedAt: serializer.fromJson(json['usedAt']), + createdAt: serializer.fromJson(json['createdAt']), + expiresAt: serializer.fromJson(json['expiresAt']), ); } @override @@ -2843,9 +2922,9 @@ class TelegramAuthCode extends DataClass 'firstName': serializer.toJson(firstName), 'lastName': serializer.toJson(lastName), 'isUsed': serializer.toJson(isUsed), - 'usedAt': serializer.toJson(usedAt), - 'createdAt': serializer.toJson(createdAt), - 'expiresAt': serializer.toJson(expiresAt), + 'usedAt': serializer.toJson(usedAt), + 'createdAt': serializer.toJson(createdAt), + 'expiresAt': serializer.toJson(expiresAt), }; } @@ -2857,9 +2936,9 @@ class TelegramAuthCode extends DataClass Value firstName = const Value.absent(), Value lastName = const Value.absent(), bool? isUsed, - Value usedAt = const Value.absent(), - DateTime? createdAt, - DateTime? expiresAt, + Value usedAt = const Value.absent(), + PgDateTime? createdAt, + PgDateTime? expiresAt, }) => TelegramAuthCode( id: id ?? this.id, code: code ?? this.code, @@ -2947,9 +3026,9 @@ class TelegramAuthCodesCompanion extends UpdateCompanion { final Value firstName; final Value lastName; final Value isUsed; - final Value usedAt; - final Value createdAt; - final Value expiresAt; + final Value usedAt; + final Value createdAt; + final Value expiresAt; final Value rowid; const TelegramAuthCodesCompanion({ this.id = const Value.absent(), @@ -2974,7 +3053,7 @@ class TelegramAuthCodesCompanion extends UpdateCompanion { this.isUsed = const Value.absent(), this.usedAt = const Value.absent(), this.createdAt = const Value.absent(), - required DateTime expiresAt, + required PgDateTime expiresAt, this.rowid = const Value.absent(), }) : code = Value(code), telegramUserId = Value(telegramUserId), @@ -2987,9 +3066,9 @@ class TelegramAuthCodesCompanion extends UpdateCompanion { Expression? firstName, Expression? lastName, Expression? isUsed, - Expression? usedAt, - Expression? createdAt, - Expression? expiresAt, + Expression? usedAt, + Expression? createdAt, + Expression? expiresAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -3015,9 +3094,9 @@ class TelegramAuthCodesCompanion extends UpdateCompanion { Value? firstName, Value? lastName, Value? isUsed, - Value? usedAt, - Value? createdAt, - Value? expiresAt, + Value? usedAt, + Value? createdAt, + Value? expiresAt, Value? rowid, }) { return TelegramAuthCodesCompanion( @@ -3060,13 +3139,22 @@ class TelegramAuthCodesCompanion extends UpdateCompanion { map['is_used'] = Variable(isUsed.value); } if (usedAt.present) { - map['used_at'] = Variable(usedAt.value); + map['used_at'] = Variable( + usedAt.value, + PgTypes.timestampWithTimezone, + ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (expiresAt.present) { - map['expires_at'] = Variable(expiresAt.value); + map['expires_at'] = Variable( + expiresAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -3107,7 +3195,7 @@ class $CardPacksTable extends CardPacks false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _titleMeta = const VerificationMeta('title'); @override @@ -3269,26 +3357,28 @@ class $CardPacksTable extends CardPacks 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -3532,11 +3622,11 @@ class $CardPacksTable extends CardPacks data['${effectivePrefix}currency'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -3572,8 +3662,8 @@ class CardPack extends DataClass implements Insertable { final String? appStoreId; final String? price; final String currency; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const CardPack({ required this.id, @@ -3635,8 +3725,14 @@ class CardPack extends DataClass implements Insertable { map['price'] = Variable(price); } map['currency'] = Variable(currency); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -3703,8 +3799,8 @@ class CardPack extends DataClass implements Insertable { appStoreId: serializer.fromJson(json['appStoreId']), price: serializer.fromJson(json['price']), currency: serializer.fromJson(json['currency']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -3728,8 +3824,8 @@ class CardPack extends DataClass implements Insertable { 'appStoreId': serializer.toJson(appStoreId), 'price': serializer.toJson(price), 'currency': serializer.toJson(currency), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -3751,8 +3847,8 @@ class CardPack extends DataClass implements Insertable { Value appStoreId = const Value.absent(), Value price = const Value.absent(), String? currency, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => CardPack( id: id ?? this.id, @@ -3897,8 +3993,8 @@ class CardPacksCompanion extends UpdateCompanion { final Value appStoreId; final Value price; final Value currency; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const CardPacksCompanion({ @@ -3964,8 +4060,8 @@ class CardPacksCompanion extends UpdateCompanion { Expression? appStoreId, Expression? price, Expression? currency, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -4010,8 +4106,8 @@ class CardPacksCompanion extends UpdateCompanion { Value? appStoreId, Value? price, Value? currency, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -4093,10 +4189,16 @@ class CardPacksCompanion extends UpdateCompanion { map['currency'] = Variable(currency.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -4149,7 +4251,7 @@ class $GameCardsTable extends GameCards false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _packIdMeta = const VerificationMeta('packId'); @override @@ -4249,26 +4351,28 @@ class $GameCardsTable extends GameCards 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -4452,11 +4556,11 @@ class $GameCardsTable extends GameCards data['${effectivePrefix}back'], ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -4483,8 +4587,8 @@ class GameCard extends DataClass implements Insertable { final String? transcription; final String? transcriptionMnemo; final String? back; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const GameCard({ required this.id, @@ -4524,8 +4628,14 @@ class GameCard extends DataClass implements Insertable { if (!nullToAbsent || back != null) { map['back'] = Variable(back); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -4574,8 +4684,8 @@ class GameCard extends DataClass implements Insertable { json['transcriptionMnemo'], ), back: serializer.fromJson(json['back']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -4593,8 +4703,8 @@ class GameCard extends DataClass implements Insertable { 'transcription': serializer.toJson(transcription), 'transcriptionMnemo': serializer.toJson(transcriptionMnemo), 'back': serializer.toJson(back), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -4610,8 +4720,8 @@ class GameCard extends DataClass implements Insertable { Value transcription = const Value.absent(), Value transcriptionMnemo = const Value.absent(), Value back = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => GameCard( id: id ?? this.id, @@ -4722,8 +4832,8 @@ class GameCardsCompanion extends UpdateCompanion { final Value transcription; final Value transcriptionMnemo; final Value back; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const GameCardsCompanion({ @@ -4772,8 +4882,8 @@ class GameCardsCompanion extends UpdateCompanion { Expression? transcription, Expression? transcriptionMnemo, Expression? back, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -4806,8 +4916,8 @@ class GameCardsCompanion extends UpdateCompanion { Value? transcription, Value? transcriptionMnemo, Value? back, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -4863,10 +4973,16 @@ class GameCardsCompanion extends UpdateCompanion { map['back'] = Variable(back.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -4913,7 +5029,7 @@ class $VoiceModelsTable extends VoiceModels false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _cardIdMeta = const VerificationMeta('cardId'); @override @@ -4953,14 +5069,15 @@ class $VoiceModelsTable extends VoiceModels 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -5040,7 +5157,7 @@ class $VoiceModelsTable extends VoiceModels data['${effectivePrefix}language'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, ); @@ -5057,7 +5174,7 @@ class VoiceModel extends DataClass implements Insertable { final String cardId; final String voiceUrl; final String language; - final DateTime createdAt; + final PgDateTime createdAt; const VoiceModel({ required this.id, required this.cardId, @@ -5072,7 +5189,10 @@ class VoiceModel extends DataClass implements Insertable { map['card_id'] = Variable(cardId); map['voice_url'] = Variable(voiceUrl); map['language'] = Variable(language); - map['created_at'] = Variable(createdAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -5096,7 +5216,7 @@ class VoiceModel extends DataClass implements Insertable { cardId: serializer.fromJson(json['cardId']), voiceUrl: serializer.fromJson(json['voiceUrl']), language: serializer.fromJson(json['language']), - createdAt: serializer.fromJson(json['createdAt']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -5107,7 +5227,7 @@ class VoiceModel extends DataClass implements Insertable { 'cardId': serializer.toJson(cardId), 'voiceUrl': serializer.toJson(voiceUrl), 'language': serializer.toJson(language), - 'createdAt': serializer.toJson(createdAt), + 'createdAt': serializer.toJson(createdAt), }; } @@ -5116,7 +5236,7 @@ class VoiceModel extends DataClass implements Insertable { String? cardId, String? voiceUrl, String? language, - DateTime? createdAt, + PgDateTime? createdAt, }) => VoiceModel( id: id ?? this.id, cardId: cardId ?? this.cardId, @@ -5164,7 +5284,7 @@ class VoiceModelsCompanion extends UpdateCompanion { final Value cardId; final Value voiceUrl; final Value language; - final Value createdAt; + final Value createdAt; final Value rowid; const VoiceModelsCompanion({ this.id = const Value.absent(), @@ -5189,7 +5309,7 @@ class VoiceModelsCompanion extends UpdateCompanion { Expression? cardId, Expression? voiceUrl, Expression? language, - Expression? createdAt, + Expression? createdAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -5207,7 +5327,7 @@ class VoiceModelsCompanion extends UpdateCompanion { Value? cardId, Value? voiceUrl, Value? language, - Value? createdAt, + Value? createdAt, Value? rowid, }) { return VoiceModelsCompanion( @@ -5236,7 +5356,10 @@ class VoiceModelsCompanion extends UpdateCompanion { map['language'] = Variable(language.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -5292,14 +5415,15 @@ class $UserPacksTable extends UserPacks 'grantedAt', ); @override - late final GeneratedColumn grantedAt = GeneratedColumn( - 'granted_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn grantedAt = + GeneratedColumn( + 'granted_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _grantTypeMeta = const VerificationMeta( 'grantType', ); @@ -5372,7 +5496,7 @@ class $UserPacksTable extends UserPacks data['${effectivePrefix}pack_id'], )!, grantedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}granted_at'], )!, grantType: attachedDatabase.typeMapping.read( @@ -5391,7 +5515,7 @@ class $UserPacksTable extends UserPacks class UserPack extends DataClass implements Insertable { final String userId; final String packId; - final DateTime grantedAt; + final PgDateTime grantedAt; final String grantType; const UserPack({ required this.userId, @@ -5404,7 +5528,10 @@ class UserPack extends DataClass implements Insertable { final map = {}; map['user_id'] = Variable(userId); map['pack_id'] = Variable(packId); - map['granted_at'] = Variable(grantedAt); + map['granted_at'] = Variable( + grantedAt, + PgTypes.timestampWithTimezone, + ); map['grant_type'] = Variable(grantType); return map; } @@ -5426,7 +5553,7 @@ class UserPack extends DataClass implements Insertable { return UserPack( userId: serializer.fromJson(json['userId']), packId: serializer.fromJson(json['packId']), - grantedAt: serializer.fromJson(json['grantedAt']), + grantedAt: serializer.fromJson(json['grantedAt']), grantType: serializer.fromJson(json['grantType']), ); } @@ -5436,7 +5563,7 @@ class UserPack extends DataClass implements Insertable { return { 'userId': serializer.toJson(userId), 'packId': serializer.toJson(packId), - 'grantedAt': serializer.toJson(grantedAt), + 'grantedAt': serializer.toJson(grantedAt), 'grantType': serializer.toJson(grantType), }; } @@ -5444,7 +5571,7 @@ class UserPack extends DataClass implements Insertable { UserPack copyWith({ String? userId, String? packId, - DateTime? grantedAt, + PgDateTime? grantedAt, String? grantType, }) => UserPack( userId: userId ?? this.userId, @@ -5487,7 +5614,7 @@ class UserPack extends DataClass implements Insertable { class UserPacksCompanion extends UpdateCompanion { final Value userId; final Value packId; - final Value grantedAt; + final Value grantedAt; final Value grantType; final Value rowid; const UserPacksCompanion({ @@ -5508,7 +5635,7 @@ class UserPacksCompanion extends UpdateCompanion { static Insertable custom({ Expression? userId, Expression? packId, - Expression? grantedAt, + Expression? grantedAt, Expression? grantType, Expression? rowid, }) { @@ -5524,7 +5651,7 @@ class UserPacksCompanion extends UpdateCompanion { UserPacksCompanion copyWith({ Value? userId, Value? packId, - Value? grantedAt, + Value? grantedAt, Value? grantType, Value? rowid, }) { @@ -5547,7 +5674,10 @@ class UserPacksCompanion extends UpdateCompanion { map['pack_id'] = Variable(packId.value); } if (grantedAt.present) { - map['granted_at'] = Variable(grantedAt.value); + map['granted_at'] = Variable( + grantedAt.value, + PgTypes.timestampWithTimezone, + ); } if (grantType.present) { map['grant_type'] = Variable(grantType.value); @@ -6331,7 +6461,7 @@ class $SubscriptionPlansTable extends SubscriptionPlans false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); @override late final GeneratedColumnWithTypeConverter?, String> @@ -6411,26 +6541,28 @@ class $SubscriptionPlansTable extends SubscriptionPlans 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -6581,11 +6713,11 @@ class $SubscriptionPlansTable extends SubscriptionPlans data['${effectivePrefix}payment_system'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -6616,8 +6748,8 @@ class SubscriptionPlan extends DataClass final List features; final String? paymentId; final String paymentSystem; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const SubscriptionPlan({ required this.id, @@ -6653,8 +6785,14 @@ class SubscriptionPlan extends DataClass map['payment_id'] = Variable(paymentId); } map['payment_system'] = Variable(paymentSystem); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -6691,8 +6829,8 @@ class SubscriptionPlan extends DataClass features: serializer.fromJson>(json['features']), paymentId: serializer.fromJson(json['paymentId']), paymentSystem: serializer.fromJson(json['paymentSystem']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -6708,8 +6846,8 @@ class SubscriptionPlan extends DataClass 'features': serializer.toJson>(features), 'paymentId': serializer.toJson(paymentId), 'paymentSystem': serializer.toJson(paymentSystem), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -6723,8 +6861,8 @@ class SubscriptionPlan extends DataClass List? features, Value paymentId = const Value.absent(), String? paymentSystem, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => SubscriptionPlan( id: id ?? this.id, @@ -6817,8 +6955,8 @@ class SubscriptionPlansCompanion extends UpdateCompanion { final Value> features; final Value paymentId; final Value paymentSystem; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const SubscriptionPlansCompanion({ @@ -6861,8 +6999,8 @@ class SubscriptionPlansCompanion extends UpdateCompanion { Expression? features, Expression? paymentId, Expression? paymentSystem, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -6891,8 +7029,8 @@ class SubscriptionPlansCompanion extends UpdateCompanion { Value>? features, Value? paymentId, Value? paymentSystem, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -6944,10 +7082,16 @@ class SubscriptionPlansCompanion extends UpdateCompanion { map['payment_system'] = Variable(paymentSystem.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -6992,7 +7136,7 @@ class $UserSubscriptionsTable extends UserSubscriptions false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -7008,20 +7152,20 @@ class $UserSubscriptionsTable extends UserSubscriptions ); static const VerificationMeta _startMeta = const VerificationMeta('start'); @override - late final GeneratedColumn start = GeneratedColumn( + late final GeneratedColumn start = GeneratedColumn( 'start', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); static const VerificationMeta _finishMeta = const VerificationMeta('finish'); @override - late final GeneratedColumn finish = GeneratedColumn( + late final GeneratedColumn finish = GeneratedColumn( 'finish', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); @override @@ -7040,26 +7184,28 @@ class $UserSubscriptionsTable extends UserSubscriptions 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -7139,11 +7285,11 @@ class $UserSubscriptionsTable extends UserSubscriptions data['${effectivePrefix}user_id'], )!, start: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}start'], )!, finish: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}finish'], )!, features: $UserSubscriptionsTable.$converterfeatures.fromSql( @@ -7153,11 +7299,11 @@ class $UserSubscriptionsTable extends UserSubscriptions )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -7176,11 +7322,11 @@ class UserSubscription extends DataClass implements Insertable { final String id; final String userId; - final DateTime start; - final DateTime finish; + final PgDateTime start; + final PgDateTime finish; final List features; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const UserSubscription({ required this.id, required this.userId, @@ -7195,15 +7341,21 @@ class UserSubscription extends DataClass final map = {}; map['id'] = Variable(id); map['user_id'] = Variable(userId); - map['start'] = Variable(start); - map['finish'] = Variable(finish); + map['start'] = Variable(start, PgTypes.timestampWithTimezone); + map['finish'] = Variable(finish, PgTypes.timestampWithTimezone); { map['features'] = Variable( $UserSubscriptionsTable.$converterfeatures.toSql(features), ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -7227,11 +7379,11 @@ class UserSubscription extends DataClass return UserSubscription( id: serializer.fromJson(json['id']), userId: serializer.fromJson(json['userId']), - start: serializer.fromJson(json['start']), - finish: serializer.fromJson(json['finish']), + start: serializer.fromJson(json['start']), + finish: serializer.fromJson(json['finish']), features: serializer.fromJson>(json['features']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -7240,22 +7392,22 @@ class UserSubscription extends DataClass return { 'id': serializer.toJson(id), 'userId': serializer.toJson(userId), - 'start': serializer.toJson(start), - 'finish': serializer.toJson(finish), + 'start': serializer.toJson(start), + 'finish': serializer.toJson(finish), 'features': serializer.toJson>(features), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } UserSubscription copyWith({ String? id, String? userId, - DateTime? start, - DateTime? finish, + PgDateTime? start, + PgDateTime? finish, List? features, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => UserSubscription( id: id ?? this.id, userId: userId ?? this.userId, @@ -7310,11 +7462,11 @@ class UserSubscription extends DataClass class UserSubscriptionsCompanion extends UpdateCompanion { final Value id; final Value userId; - final Value start; - final Value finish; + final Value start; + final Value finish; final Value> features; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const UserSubscriptionsCompanion({ this.id = const Value.absent(), @@ -7329,8 +7481,8 @@ class UserSubscriptionsCompanion extends UpdateCompanion { UserSubscriptionsCompanion.insert({ this.id = const Value.absent(), required String userId, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, this.features = const Value.absent(), this.createdAt = const Value.absent(), this.updatedAt = const Value.absent(), @@ -7341,11 +7493,11 @@ class UserSubscriptionsCompanion extends UpdateCompanion { static Insertable custom({ Expression? id, Expression? userId, - Expression? start, - Expression? finish, + Expression? start, + Expression? finish, Expression? features, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -7363,11 +7515,11 @@ class UserSubscriptionsCompanion extends UpdateCompanion { UserSubscriptionsCompanion copyWith({ Value? id, Value? userId, - Value? start, - Value? finish, + Value? start, + Value? finish, Value>? features, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return UserSubscriptionsCompanion( @@ -7392,10 +7544,16 @@ class UserSubscriptionsCompanion extends UpdateCompanion { map['user_id'] = Variable(userId.value); } if (start.present) { - map['start'] = Variable(start.value); + map['start'] = Variable( + start.value, + PgTypes.timestampWithTimezone, + ); } if (finish.present) { - map['finish'] = Variable(finish.value); + map['finish'] = Variable( + finish.value, + PgTypes.timestampWithTimezone, + ); } if (features.present) { map['features'] = Variable( @@ -7403,10 +7561,16 @@ class UserSubscriptionsCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -7443,7 +7607,7 @@ class $PaymentsTable extends Payments with TableInfo<$PaymentsTable, Payment> { false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -7519,13 +7683,13 @@ class $PaymentsTable extends Payments with TableInfo<$PaymentsTable, Payment> { ); static const VerificationMeta _dateMeta = const VerificationMeta('date'); @override - late final GeneratedColumn date = GeneratedColumn( + late final GeneratedColumn date = GeneratedColumn( 'date', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, - defaultValue: currentTimestamp, + defaultValue: now(), ); @override late final GeneratedColumnWithTypeConverter, String> products = @@ -7564,26 +7728,28 @@ class $PaymentsTable extends Payments with TableInfo<$PaymentsTable, Payment> { 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -7743,7 +7909,7 @@ class $PaymentsTable extends Payments with TableInfo<$PaymentsTable, Payment> { data['${effectivePrefix}meta'], ), date: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}date'], )!, products: $PaymentsTable.$converterproducts.fromSql( @@ -7763,11 +7929,11 @@ class $PaymentsTable extends Payments with TableInfo<$PaymentsTable, Payment> { data['${effectivePrefix}subscription'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -7793,12 +7959,12 @@ class Payment extends DataClass implements Insertable { final String paymentSystem; final String? externalToken; final String? meta; - final DateTime date; + final PgDateTime date; final List products; final List packs; final bool subscription; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const Payment({ required this.id, required this.userId, @@ -7830,7 +7996,7 @@ class Payment extends DataClass implements Insertable { if (!nullToAbsent || meta != null) { map['meta'] = Variable(meta); } - map['date'] = Variable(date); + map['date'] = Variable(date, PgTypes.timestampWithTimezone); { map['products'] = Variable( $PaymentsTable.$converterproducts.toSql(products), @@ -7842,8 +8008,14 @@ class Payment extends DataClass implements Insertable { ); } map['subscription'] = Variable(subscription); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -7882,12 +8054,12 @@ class Payment extends DataClass implements Insertable { paymentSystem: serializer.fromJson(json['paymentSystem']), externalToken: serializer.fromJson(json['externalToken']), meta: serializer.fromJson(json['meta']), - date: serializer.fromJson(json['date']), + date: serializer.fromJson(json['date']), products: serializer.fromJson>(json['products']), packs: serializer.fromJson>(json['packs']), subscription: serializer.fromJson(json['subscription']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -7902,12 +8074,12 @@ class Payment extends DataClass implements Insertable { 'paymentSystem': serializer.toJson(paymentSystem), 'externalToken': serializer.toJson(externalToken), 'meta': serializer.toJson(meta), - 'date': serializer.toJson(date), + 'date': serializer.toJson(date), 'products': serializer.toJson>(products), 'packs': serializer.toJson>(packs), 'subscription': serializer.toJson(subscription), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -7920,12 +8092,12 @@ class Payment extends DataClass implements Insertable { String? paymentSystem, Value externalToken = const Value.absent(), Value meta = const Value.absent(), - DateTime? date, + PgDateTime? date, List? products, List? packs, bool? subscription, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => Payment( id: id ?? this.id, userId: userId ?? this.userId, @@ -8036,12 +8208,12 @@ class PaymentsCompanion extends UpdateCompanion { final Value paymentSystem; final Value externalToken; final Value meta; - final Value date; + final Value date; final Value> products; final Value> packs; final Value subscription; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const PaymentsCompanion({ this.id = const Value.absent(), @@ -8090,12 +8262,12 @@ class PaymentsCompanion extends UpdateCompanion { Expression? paymentSystem, Expression? externalToken, Expression? meta, - Expression? date, + Expression? date, Expression? products, Expression? packs, Expression? subscription, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -8126,12 +8298,12 @@ class PaymentsCompanion extends UpdateCompanion { Value? paymentSystem, Value? externalToken, Value? meta, - Value? date, + Value? date, Value>? products, Value>? packs, Value? subscription, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return PaymentsCompanion( @@ -8181,7 +8353,10 @@ class PaymentsCompanion extends UpdateCompanion { map['meta'] = Variable(meta.value); } if (date.present) { - map['date'] = Variable(date.value); + map['date'] = Variable( + date.value, + PgTypes.timestampWithTimezone, + ); } if (products.present) { map['products'] = Variable( @@ -8197,10 +8372,16 @@ class PaymentsCompanion extends UpdateCompanion { map['subscription'] = Variable(subscription.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -8244,7 +8425,7 @@ class $TestsTable extends Tests with TableInfo<$TestsTable, Test> { false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override @@ -8308,26 +8489,28 @@ class $TestsTable extends Tests with TableInfo<$TestsTable, Test> { 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -8466,11 +8649,11 @@ class $TestsTable extends Tests with TableInfo<$TestsTable, Test> { data['${effectivePrefix}time_subtitle'], ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -8494,8 +8677,8 @@ class Test extends DataClass implements Insertable { final String? version; final String? time; final String? timeSubtitle; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const Test({ required this.id, @@ -8529,8 +8712,14 @@ class Test extends DataClass implements Insertable { if (!nullToAbsent || timeSubtitle != null) { map['time_subtitle'] = Variable(timeSubtitle); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -8571,8 +8760,8 @@ class Test extends DataClass implements Insertable { version: serializer.fromJson(json['version']), time: serializer.fromJson(json['time']), timeSubtitle: serializer.fromJson(json['timeSubtitle']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -8587,8 +8776,8 @@ class Test extends DataClass implements Insertable { 'version': serializer.toJson(version), 'time': serializer.toJson(time), 'timeSubtitle': serializer.toJson(timeSubtitle), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -8601,8 +8790,8 @@ class Test extends DataClass implements Insertable { Value version = const Value.absent(), Value time = const Value.absent(), Value timeSubtitle = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => Test( id: id ?? this.id, @@ -8687,8 +8876,8 @@ class TestsCompanion extends UpdateCompanion { final Value version; final Value time; final Value timeSubtitle; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const TestsCompanion({ @@ -8725,8 +8914,8 @@ class TestsCompanion extends UpdateCompanion { Expression? version, Expression? time, Expression? timeSubtitle, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -8753,8 +8942,8 @@ class TestsCompanion extends UpdateCompanion { Value? version, Value? time, Value? timeSubtitle, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -8798,10 +8987,16 @@ class TestsCompanion extends UpdateCompanion { map['time_subtitle'] = Variable(timeSubtitle.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -8845,7 +9040,7 @@ class $TestQuestionsTable extends TestQuestions false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _testIdMeta = const VerificationMeta('testId'); @override @@ -8883,26 +9078,28 @@ class $TestQuestionsTable extends TestQuestions 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -8992,11 +9189,11 @@ class $TestQuestionsTable extends TestQuestions data['${effectivePrefix}body'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -9013,8 +9210,8 @@ class TestQuestion extends DataClass implements Insertable { final String testId; final String questionType; final String body; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const TestQuestion({ required this.id, required this.testId, @@ -9030,8 +9227,14 @@ class TestQuestion extends DataClass implements Insertable { map['test_id'] = Variable(testId); map['question_type'] = Variable(questionType); map['body'] = Variable(body); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -9056,8 +9259,8 @@ class TestQuestion extends DataClass implements Insertable { testId: serializer.fromJson(json['testId']), questionType: serializer.fromJson(json['questionType']), body: serializer.fromJson(json['body']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -9068,8 +9271,8 @@ class TestQuestion extends DataClass implements Insertable { 'testId': serializer.toJson(testId), 'questionType': serializer.toJson(questionType), 'body': serializer.toJson(body), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -9078,8 +9281,8 @@ class TestQuestion extends DataClass implements Insertable { String? testId, String? questionType, String? body, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => TestQuestion( id: id ?? this.id, testId: testId ?? this.testId, @@ -9134,8 +9337,8 @@ class TestQuestionsCompanion extends UpdateCompanion { final Value testId; final Value questionType; final Value body; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const TestQuestionsCompanion({ this.id = const Value.absent(), @@ -9162,8 +9365,8 @@ class TestQuestionsCompanion extends UpdateCompanion { Expression? testId, Expression? questionType, Expression? body, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -9182,8 +9385,8 @@ class TestQuestionsCompanion extends UpdateCompanion { Value? testId, Value? questionType, Value? body, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return TestQuestionsCompanion( @@ -9213,10 +9416,16 @@ class TestQuestionsCompanion extends UpdateCompanion { map['body'] = Variable(body.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -9474,7 +9683,7 @@ class $TestStatisticsTable extends TestStatistics false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -9514,38 +9723,41 @@ class $TestStatisticsTable extends TestStatistics 'completedAt', ); @override - late final GeneratedColumn completedAt = GeneratedColumn( - 'completed_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn completedAt = + GeneratedColumn( + 'completed_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _createdAtMeta = const VerificationMeta( 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -9636,15 +9848,15 @@ class $TestStatisticsTable extends TestStatistics )!, ), completedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}completed_at'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -9664,9 +9876,9 @@ class TestStatistic extends DataClass implements Insertable { final String userId; final String testId; final Map? results; - final DateTime completedAt; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime completedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const TestStatistic({ required this.id, required this.userId, @@ -9687,9 +9899,18 @@ class TestStatistic extends DataClass implements Insertable { $TestStatisticsTable.$converterresults.toSql(results), ); } - map['completed_at'] = Variable(completedAt); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['completed_at'] = Variable( + completedAt, + PgTypes.timestampWithTimezone, + ); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -9717,9 +9938,9 @@ class TestStatistic extends DataClass implements Insertable { userId: serializer.fromJson(json['userId']), testId: serializer.fromJson(json['testId']), results: serializer.fromJson?>(json['results']), - completedAt: serializer.fromJson(json['completedAt']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + completedAt: serializer.fromJson(json['completedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -9730,9 +9951,9 @@ class TestStatistic extends DataClass implements Insertable { 'userId': serializer.toJson(userId), 'testId': serializer.toJson(testId), 'results': serializer.toJson?>(results), - 'completedAt': serializer.toJson(completedAt), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'completedAt': serializer.toJson(completedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -9741,9 +9962,9 @@ class TestStatistic extends DataClass implements Insertable { String? userId, String? testId, Value?> results = const Value.absent(), - DateTime? completedAt, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? completedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => TestStatistic( id: id ?? this.id, userId: userId ?? this.userId, @@ -9809,9 +10030,9 @@ class TestStatisticsCompanion extends UpdateCompanion { final Value userId; final Value testId; final Value?> results; - final Value completedAt; - final Value createdAt; - final Value updatedAt; + final Value completedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const TestStatisticsCompanion({ this.id = const Value.absent(), @@ -9839,9 +10060,9 @@ class TestStatisticsCompanion extends UpdateCompanion { Expression? userId, Expression? testId, Expression? results, - Expression? completedAt, - Expression? createdAt, - Expression? updatedAt, + Expression? completedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -9861,9 +10082,9 @@ class TestStatisticsCompanion extends UpdateCompanion { Value? userId, Value? testId, Value?>? results, - Value? completedAt, - Value? createdAt, - Value? updatedAt, + Value? completedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return TestStatisticsCompanion( @@ -9896,13 +10117,22 @@ class TestStatisticsCompanion extends UpdateCompanion { ); } if (completedAt.present) { - map['completed_at'] = Variable(completedAt.value); + map['completed_at'] = Variable( + completedAt.value, + PgTypes.timestampWithTimezone, + ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -9939,7 +10169,7 @@ class $TasksTable extends Tasks with TableInfo<$TasksTable, Task> { false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override @@ -10018,38 +10248,40 @@ class $TasksTable extends Tasks with TableInfo<$TasksTable, Task> { 'lastExecution', ); @override - late final GeneratedColumn lastExecution = - GeneratedColumn( + late final GeneratedColumn lastExecution = + GeneratedColumn( 'last_execution', aliasedName, true, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, ); static const VerificationMeta _createdAtMeta = const VerificationMeta( 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -10209,15 +10441,15 @@ class $TasksTable extends Tasks with TableInfo<$TasksTable, Task> { data['${effectivePrefix}description'], ), lastExecution: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}last_execution'], ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -10238,9 +10470,9 @@ class Task extends DataClass implements Insertable { final int timeoutMillis; final String? status; final String? description; - final DateTime? lastExecution; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime? lastExecution; + final PgDateTime createdAt; + final PgDateTime updatedAt; const Task({ required this.id, required this.name, @@ -10270,10 +10502,19 @@ class Task extends DataClass implements Insertable { map['description'] = Variable(description); } if (!nullToAbsent || lastExecution != null) { - map['last_execution'] = Variable(lastExecution); + map['last_execution'] = Variable( + lastExecution, + PgTypes.timestampWithTimezone, + ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -10313,9 +10554,9 @@ class Task extends DataClass implements Insertable { timeoutMillis: serializer.fromJson(json['timeoutMillis']), status: serializer.fromJson(json['status']), description: serializer.fromJson(json['description']), - lastExecution: serializer.fromJson(json['lastExecution']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + lastExecution: serializer.fromJson(json['lastExecution']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -10330,9 +10571,9 @@ class Task extends DataClass implements Insertable { 'timeoutMillis': serializer.toJson(timeoutMillis), 'status': serializer.toJson(status), 'description': serializer.toJson(description), - 'lastExecution': serializer.toJson(lastExecution), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'lastExecution': serializer.toJson(lastExecution), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -10345,9 +10586,9 @@ class Task extends DataClass implements Insertable { int? timeoutMillis, Value status = const Value.absent(), Value description = const Value.absent(), - Value lastExecution = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + Value lastExecution = const Value.absent(), + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => Task( id: id ?? this.id, name: name ?? this.name, @@ -10449,9 +10690,9 @@ class TasksCompanion extends UpdateCompanion { final Value timeoutMillis; final Value status; final Value description; - final Value lastExecution; - final Value createdAt; - final Value updatedAt; + final Value lastExecution; + final Value createdAt; + final Value updatedAt; final Value rowid; const TasksCompanion({ this.id = const Value.absent(), @@ -10494,9 +10735,9 @@ class TasksCompanion extends UpdateCompanion { Expression? timeoutMillis, Expression? status, Expression? description, - Expression? lastExecution, - Expression? createdAt, - Expression? updatedAt, + Expression? lastExecution, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -10524,9 +10765,9 @@ class TasksCompanion extends UpdateCompanion { Value? timeoutMillis, Value? status, Value? description, - Value? lastExecution, - Value? createdAt, - Value? updatedAt, + Value? lastExecution, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return TasksCompanion( @@ -10573,13 +10814,22 @@ class TasksCompanion extends UpdateCompanion { map['description'] = Variable(description.value); } if (lastExecution.present) { - map['last_execution'] = Variable(lastExecution.value); + map['last_execution'] = Variable( + lastExecution.value, + PgTypes.timestampWithTimezone, + ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -10621,7 +10871,7 @@ class $UserTasksTable extends UserTasks false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _titleMeta = const VerificationMeta('title'); @override @@ -10686,36 +10936,39 @@ class $UserTasksTable extends UserTasks 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _expiresAtMeta = const VerificationMeta( 'expiresAt', ); @override - late final GeneratedColumn expiresAt = GeneratedColumn( - 'expires_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: true, - ); + late final GeneratedColumn expiresAt = + GeneratedColumn( + 'expires_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: true, + ); static const VerificationMeta _completedAtMeta = const VerificationMeta( 'completedAt', ); @override - late final GeneratedColumn completedAt = GeneratedColumn( - 'completed_at', - aliasedName, - true, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - ); + late final GeneratedColumn completedAt = + GeneratedColumn( + 'completed_at', + aliasedName, + true, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + ); static const VerificationMeta _proofUrlMeta = const VerificationMeta( 'proofUrl', ); @@ -10763,14 +11016,15 @@ class $UserTasksTable extends UserTasks 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -10937,15 +11191,15 @@ class $UserTasksTable extends UserTasks )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, expiresAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}expires_at'], )!, completedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}completed_at'], ), proofUrl: attachedDatabase.typeMapping.read( @@ -10967,7 +11221,7 @@ class $UserTasksTable extends UserTasks data['${effectivePrefix}image_url'], ), updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -10992,14 +11246,14 @@ class UserTask extends DataClass implements Insertable { final String difficulty; final String status; final List rewards; - final DateTime createdAt; - final DateTime expiresAt; - final DateTime? completedAt; + final PgDateTime createdAt; + final PgDateTime expiresAt; + final PgDateTime? completedAt; final String? proofUrl; final String? instructions; final List tags; final String? imageUrl; - final DateTime updatedAt; + final PgDateTime updatedAt; const UserTask({ required this.id, required this.title, @@ -11031,10 +11285,19 @@ class UserTask extends DataClass implements Insertable { $UserTasksTable.$converterrewards.toSql(rewards), ); } - map['created_at'] = Variable(createdAt); - map['expires_at'] = Variable(expiresAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['expires_at'] = Variable( + expiresAt, + PgTypes.timestampWithTimezone, + ); if (!nullToAbsent || completedAt != null) { - map['completed_at'] = Variable(completedAt); + map['completed_at'] = Variable( + completedAt, + PgTypes.timestampWithTimezone, + ); } if (!nullToAbsent || proofUrl != null) { map['proof_url'] = Variable(proofUrl); @@ -11050,7 +11313,10 @@ class UserTask extends DataClass implements Insertable { if (!nullToAbsent || imageUrl != null) { map['image_url'] = Variable(imageUrl); } - map['updated_at'] = Variable(updatedAt); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -11095,14 +11361,14 @@ class UserTask extends DataClass implements Insertable { difficulty: serializer.fromJson(json['difficulty']), status: serializer.fromJson(json['status']), rewards: serializer.fromJson>(json['rewards']), - createdAt: serializer.fromJson(json['createdAt']), - expiresAt: serializer.fromJson(json['expiresAt']), - completedAt: serializer.fromJson(json['completedAt']), + createdAt: serializer.fromJson(json['createdAt']), + expiresAt: serializer.fromJson(json['expiresAt']), + completedAt: serializer.fromJson(json['completedAt']), proofUrl: serializer.fromJson(json['proofUrl']), instructions: serializer.fromJson(json['instructions']), tags: serializer.fromJson>(json['tags']), imageUrl: serializer.fromJson(json['imageUrl']), - updatedAt: serializer.fromJson(json['updatedAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -11116,14 +11382,14 @@ class UserTask extends DataClass implements Insertable { 'difficulty': serializer.toJson(difficulty), 'status': serializer.toJson(status), 'rewards': serializer.toJson>(rewards), - 'createdAt': serializer.toJson(createdAt), - 'expiresAt': serializer.toJson(expiresAt), - 'completedAt': serializer.toJson(completedAt), + 'createdAt': serializer.toJson(createdAt), + 'expiresAt': serializer.toJson(expiresAt), + 'completedAt': serializer.toJson(completedAt), 'proofUrl': serializer.toJson(proofUrl), 'instructions': serializer.toJson(instructions), 'tags': serializer.toJson>(tags), 'imageUrl': serializer.toJson(imageUrl), - 'updatedAt': serializer.toJson(updatedAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -11135,14 +11401,14 @@ class UserTask extends DataClass implements Insertable { String? difficulty, String? status, List? rewards, - DateTime? createdAt, - DateTime? expiresAt, - Value completedAt = const Value.absent(), + PgDateTime? createdAt, + PgDateTime? expiresAt, + Value completedAt = const Value.absent(), Value proofUrl = const Value.absent(), Value instructions = const Value.absent(), List? tags, Value imageUrl = const Value.absent(), - DateTime? updatedAt, + PgDateTime? updatedAt, }) => UserTask( id: id ?? this.id, title: title ?? this.title, @@ -11257,14 +11523,14 @@ class UserTasksCompanion extends UpdateCompanion { final Value difficulty; final Value status; final Value> rewards; - final Value createdAt; - final Value expiresAt; - final Value completedAt; + final Value createdAt; + final Value expiresAt; + final Value completedAt; final Value proofUrl; final Value instructions; final Value> tags; final Value imageUrl; - final Value updatedAt; + final Value updatedAt; final Value rowid; const UserTasksCompanion({ this.id = const Value.absent(), @@ -11293,7 +11559,7 @@ class UserTasksCompanion extends UpdateCompanion { required String status, this.rewards = const Value.absent(), this.createdAt = const Value.absent(), - required DateTime expiresAt, + required PgDateTime expiresAt, this.completedAt = const Value.absent(), this.proofUrl = const Value.absent(), this.instructions = const Value.absent(), @@ -11315,14 +11581,14 @@ class UserTasksCompanion extends UpdateCompanion { Expression? difficulty, Expression? status, Expression? rewards, - Expression? createdAt, - Expression? expiresAt, - Expression? completedAt, + Expression? createdAt, + Expression? expiresAt, + Expression? completedAt, Expression? proofUrl, Expression? instructions, Expression? tags, Expression? imageUrl, - Expression? updatedAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -11353,14 +11619,14 @@ class UserTasksCompanion extends UpdateCompanion { Value? difficulty, Value? status, Value>? rewards, - Value? createdAt, - Value? expiresAt, - Value? completedAt, + Value? createdAt, + Value? expiresAt, + Value? completedAt, Value? proofUrl, Value? instructions, Value>? tags, Value? imageUrl, - Value? updatedAt, + Value? updatedAt, Value? rowid, }) { return UserTasksCompanion( @@ -11410,13 +11676,22 @@ class UserTasksCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (expiresAt.present) { - map['expires_at'] = Variable(expiresAt.value); + map['expires_at'] = Variable( + expiresAt.value, + PgTypes.timestampWithTimezone, + ); } if (completedAt.present) { - map['completed_at'] = Variable(completedAt.value); + map['completed_at'] = Variable( + completedAt.value, + PgTypes.timestampWithTimezone, + ); } if (proofUrl.present) { map['proof_url'] = Variable(proofUrl.value); @@ -11433,7 +11708,10 @@ class UserTasksCompanion extends UpdateCompanion { map['image_url'] = Variable(imageUrl.value); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -11479,7 +11757,7 @@ class $UserTaskProgressesTable extends UserTaskProgresses false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -11519,26 +11797,28 @@ class $UserTaskProgressesTable extends UserTaskProgresses 'startedAt', ); @override - late final GeneratedColumn startedAt = GeneratedColumn( - 'started_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn startedAt = + GeneratedColumn( + 'started_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -11619,11 +11899,11 @@ class $UserTaskProgressesTable extends UserTaskProgresses )!, ), startedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}started_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -11644,8 +11924,8 @@ class UserTaskProgressesData extends DataClass final String userId; final String taskId; final Map? progress; - final DateTime startedAt; - final DateTime updatedAt; + final PgDateTime startedAt; + final PgDateTime updatedAt; const UserTaskProgressesData({ required this.id, required this.userId, @@ -11665,8 +11945,14 @@ class UserTaskProgressesData extends DataClass $UserTaskProgressesTable.$converterprogress.toSql(progress), ); } - map['started_at'] = Variable(startedAt); - map['updated_at'] = Variable(updatedAt); + map['started_at'] = Variable( + startedAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -11693,8 +11979,8 @@ class UserTaskProgressesData extends DataClass userId: serializer.fromJson(json['userId']), taskId: serializer.fromJson(json['taskId']), progress: serializer.fromJson?>(json['progress']), - startedAt: serializer.fromJson(json['startedAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + startedAt: serializer.fromJson(json['startedAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -11705,8 +11991,8 @@ class UserTaskProgressesData extends DataClass 'userId': serializer.toJson(userId), 'taskId': serializer.toJson(taskId), 'progress': serializer.toJson?>(progress), - 'startedAt': serializer.toJson(startedAt), - 'updatedAt': serializer.toJson(updatedAt), + 'startedAt': serializer.toJson(startedAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -11715,8 +12001,8 @@ class UserTaskProgressesData extends DataClass String? userId, String? taskId, Value?> progress = const Value.absent(), - DateTime? startedAt, - DateTime? updatedAt, + PgDateTime? startedAt, + PgDateTime? updatedAt, }) => UserTaskProgressesData( id: id ?? this.id, userId: userId ?? this.userId, @@ -11770,8 +12056,8 @@ class UserTaskProgressesCompanion final Value userId; final Value taskId; final Value?> progress; - final Value startedAt; - final Value updatedAt; + final Value startedAt; + final Value updatedAt; final Value rowid; const UserTaskProgressesCompanion({ this.id = const Value.absent(), @@ -11797,8 +12083,8 @@ class UserTaskProgressesCompanion Expression? userId, Expression? taskId, Expression? progress, - Expression? startedAt, - Expression? updatedAt, + Expression? startedAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -11817,8 +12103,8 @@ class UserTaskProgressesCompanion Value? userId, Value? taskId, Value?>? progress, - Value? startedAt, - Value? updatedAt, + Value? startedAt, + Value? updatedAt, Value? rowid, }) { return UserTaskProgressesCompanion( @@ -11850,10 +12136,16 @@ class UserTaskProgressesCompanion ); } if (startedAt.present) { - map['started_at'] = Variable(startedAt.value); + map['started_at'] = Variable( + startedAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -11890,7 +12182,7 @@ class $UserTaskResultsTable extends UserTaskResults false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -11930,26 +12222,28 @@ class $UserTaskResultsTable extends UserTaskResults 'completedAt', ); @override - late final GeneratedColumn completedAt = GeneratedColumn( - 'completed_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn completedAt = + GeneratedColumn( + 'completed_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _createdAtMeta = const VerificationMeta( 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -12033,11 +12327,11 @@ class $UserTaskResultsTable extends UserTaskResults )!, ), completedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}completed_at'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, ); @@ -12057,8 +12351,8 @@ class UserTaskResult extends DataClass implements Insertable { final String userId; final String taskId; final Map? results; - final DateTime completedAt; - final DateTime createdAt; + final PgDateTime completedAt; + final PgDateTime createdAt; const UserTaskResult({ required this.id, required this.userId, @@ -12078,8 +12372,14 @@ class UserTaskResult extends DataClass implements Insertable { $UserTaskResultsTable.$converterresults.toSql(results), ); } - map['completed_at'] = Variable(completedAt); - map['created_at'] = Variable(createdAt); + map['completed_at'] = Variable( + completedAt, + PgTypes.timestampWithTimezone, + ); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -12106,8 +12406,8 @@ class UserTaskResult extends DataClass implements Insertable { userId: serializer.fromJson(json['userId']), taskId: serializer.fromJson(json['taskId']), results: serializer.fromJson?>(json['results']), - completedAt: serializer.fromJson(json['completedAt']), - createdAt: serializer.fromJson(json['createdAt']), + completedAt: serializer.fromJson(json['completedAt']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -12118,8 +12418,8 @@ class UserTaskResult extends DataClass implements Insertable { 'userId': serializer.toJson(userId), 'taskId': serializer.toJson(taskId), 'results': serializer.toJson?>(results), - 'completedAt': serializer.toJson(completedAt), - 'createdAt': serializer.toJson(createdAt), + 'completedAt': serializer.toJson(completedAt), + 'createdAt': serializer.toJson(createdAt), }; } @@ -12128,8 +12428,8 @@ class UserTaskResult extends DataClass implements Insertable { String? userId, String? taskId, Value?> results = const Value.absent(), - DateTime? completedAt, - DateTime? createdAt, + PgDateTime? completedAt, + PgDateTime? createdAt, }) => UserTaskResult( id: id ?? this.id, userId: userId ?? this.userId, @@ -12184,8 +12484,8 @@ class UserTaskResultsCompanion extends UpdateCompanion { final Value userId; final Value taskId; final Value?> results; - final Value completedAt; - final Value createdAt; + final Value completedAt; + final Value createdAt; final Value rowid; const UserTaskResultsCompanion({ this.id = const Value.absent(), @@ -12211,8 +12511,8 @@ class UserTaskResultsCompanion extends UpdateCompanion { Expression? userId, Expression? taskId, Expression? results, - Expression? completedAt, - Expression? createdAt, + Expression? completedAt, + Expression? createdAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -12231,8 +12531,8 @@ class UserTaskResultsCompanion extends UpdateCompanion { Value? userId, Value? taskId, Value?>? results, - Value? completedAt, - Value? createdAt, + Value? completedAt, + Value? createdAt, Value? rowid, }) { return UserTaskResultsCompanion( @@ -12264,10 +12564,16 @@ class UserTaskResultsCompanion extends UpdateCompanion { ); } if (completedAt.present) { - map['completed_at'] = Variable(completedAt.value); + map['completed_at'] = Variable( + completedAt.value, + PgTypes.timestampWithTimezone, + ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -12304,7 +12610,7 @@ class $PromoCodesCampaignsTable extends PromoCodesCampaigns false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _templateMeta = const VerificationMeta( 'template', @@ -12371,20 +12677,20 @@ class $PromoCodesCampaignsTable extends PromoCodesCampaigns ); static const VerificationMeta _startMeta = const VerificationMeta('start'); @override - late final GeneratedColumn start = GeneratedColumn( + late final GeneratedColumn start = GeneratedColumn( 'start', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); static const VerificationMeta _finishMeta = const VerificationMeta('finish'); @override - late final GeneratedColumn finish = GeneratedColumn( + late final GeneratedColumn finish = GeneratedColumn( 'finish', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); static const VerificationMeta _statusMeta = const VerificationMeta('status'); @@ -12410,26 +12716,28 @@ class $PromoCodesCampaignsTable extends PromoCodesCampaigns 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -12604,11 +12912,11 @@ class $PromoCodesCampaignsTable extends PromoCodesCampaigns data['${effectivePrefix}generation_size'], )!, start: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}start'], )!, finish: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}finish'], )!, status: attachedDatabase.typeMapping.read( @@ -12622,11 +12930,11 @@ class $PromoCodesCampaignsTable extends PromoCodesCampaigns )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -12656,12 +12964,12 @@ class PromoCodesCampaign extends DataClass final int activationsPerCode; final int activationsPerUser; final int generationSize; - final DateTime start; - final DateTime finish; + final PgDateTime start; + final PgDateTime finish; final String status; final List tags; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const PromoCodesCampaign({ required this.id, @@ -12695,16 +13003,22 @@ class PromoCodesCampaign extends DataClass map['activations_per_code'] = Variable(activationsPerCode); map['activations_per_user'] = Variable(activationsPerUser); map['generation_size'] = Variable(generationSize); - map['start'] = Variable(start); - map['finish'] = Variable(finish); + map['start'] = Variable(start, PgTypes.timestampWithTimezone); + map['finish'] = Variable(finish, PgTypes.timestampWithTimezone); map['status'] = Variable(status); { map['tags'] = Variable( $PromoCodesCampaignsTable.$convertertags.toSql(tags), ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -12741,12 +13055,12 @@ class PromoCodesCampaign extends DataClass activationsPerCode: serializer.fromJson(json['activationsPerCode']), activationsPerUser: serializer.fromJson(json['activationsPerUser']), generationSize: serializer.fromJson(json['generationSize']), - start: serializer.fromJson(json['start']), - finish: serializer.fromJson(json['finish']), + start: serializer.fromJson(json['start']), + finish: serializer.fromJson(json['finish']), status: serializer.fromJson(json['status']), tags: serializer.fromJson>(json['tags']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -12761,12 +13075,12 @@ class PromoCodesCampaign extends DataClass 'activationsPerCode': serializer.toJson(activationsPerCode), 'activationsPerUser': serializer.toJson(activationsPerUser), 'generationSize': serializer.toJson(generationSize), - 'start': serializer.toJson(start), - 'finish': serializer.toJson(finish), + 'start': serializer.toJson(start), + 'finish': serializer.toJson(finish), 'status': serializer.toJson(status), 'tags': serializer.toJson>(tags), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -12779,12 +13093,12 @@ class PromoCodesCampaign extends DataClass int? activationsPerCode, int? activationsPerUser, int? generationSize, - DateTime? start, - DateTime? finish, + PgDateTime? start, + PgDateTime? finish, String? status, List? tags, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => PromoCodesCampaign( id: id ?? this.id, @@ -12893,12 +13207,12 @@ class PromoCodesCampaignsCompanion extends UpdateCompanion { final Value activationsPerCode; final Value activationsPerUser; final Value generationSize; - final Value start; - final Value finish; + final Value start; + final Value finish; final Value status; final Value> tags; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const PromoCodesCampaignsCompanion({ @@ -12926,8 +13240,8 @@ class PromoCodesCampaignsCompanion extends UpdateCompanion { required int activationsPerCode, required int activationsPerUser, required int generationSize, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, required String status, this.tags = const Value.absent(), this.createdAt = const Value.absent(), @@ -12949,12 +13263,12 @@ class PromoCodesCampaignsCompanion extends UpdateCompanion { Expression? activationsPerCode, Expression? activationsPerUser, Expression? generationSize, - Expression? start, - Expression? finish, + Expression? start, + Expression? finish, Expression? status, Expression? tags, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -12987,12 +13301,12 @@ class PromoCodesCampaignsCompanion extends UpdateCompanion { Value? activationsPerCode, Value? activationsPerUser, Value? generationSize, - Value? start, - Value? finish, + Value? start, + Value? finish, Value? status, Value>? tags, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -13042,10 +13356,16 @@ class PromoCodesCampaignsCompanion extends UpdateCompanion { map['generation_size'] = Variable(generationSize.value); } if (start.present) { - map['start'] = Variable(start.value); + map['start'] = Variable( + start.value, + PgTypes.timestampWithTimezone, + ); } if (finish.present) { - map['finish'] = Variable(finish.value); + map['finish'] = Variable( + finish.value, + PgTypes.timestampWithTimezone, + ); } if (status.present) { map['status'] = Variable(status.value); @@ -13056,10 +13376,16 @@ class PromoCodesCampaignsCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -13107,7 +13433,7 @@ class $PromoCodesTable extends PromoCodes false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _campaignIdMeta = const VerificationMeta( 'campaignId', @@ -13161,26 +13487,28 @@ class $PromoCodesTable extends PromoCodes 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -13279,11 +13607,11 @@ class $PromoCodesTable extends PromoCodes data['${effectivePrefix}user_id'], ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -13301,8 +13629,8 @@ class PromoCode extends DataClass implements Insertable { final String code; final int activations; final String? userId; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const PromoCode({ required this.id, required this.campaignId, @@ -13322,8 +13650,14 @@ class PromoCode extends DataClass implements Insertable { if (!nullToAbsent || userId != null) { map['user_id'] = Variable(userId); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -13352,8 +13686,8 @@ class PromoCode extends DataClass implements Insertable { code: serializer.fromJson(json['code']), activations: serializer.fromJson(json['activations']), userId: serializer.fromJson(json['userId']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -13365,8 +13699,8 @@ class PromoCode extends DataClass implements Insertable { 'code': serializer.toJson(code), 'activations': serializer.toJson(activations), 'userId': serializer.toJson(userId), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -13376,8 +13710,8 @@ class PromoCode extends DataClass implements Insertable { String? code, int? activations, Value userId = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => PromoCode( id: id ?? this.id, campaignId: campaignId ?? this.campaignId, @@ -13446,8 +13780,8 @@ class PromoCodesCompanion extends UpdateCompanion { final Value code; final Value activations; final Value userId; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const PromoCodesCompanion({ this.id = const Value.absent(), @@ -13476,8 +13810,8 @@ class PromoCodesCompanion extends UpdateCompanion { Expression? code, Expression? activations, Expression? userId, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -13498,8 +13832,8 @@ class PromoCodesCompanion extends UpdateCompanion { Value? code, Value? activations, Value? userId, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return PromoCodesCompanion( @@ -13533,10 +13867,16 @@ class PromoCodesCompanion extends UpdateCompanion { map['user_id'] = Variable(userId.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -13574,7 +13914,7 @@ class $DiscountCampaignsTable extends DiscountCampaigns false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override @@ -13587,20 +13927,20 @@ class $DiscountCampaignsTable extends DiscountCampaigns ); static const VerificationMeta _startMeta = const VerificationMeta('start'); @override - late final GeneratedColumn start = GeneratedColumn( + late final GeneratedColumn start = GeneratedColumn( 'start', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); static const VerificationMeta _finishMeta = const VerificationMeta('finish'); @override - late final GeneratedColumn finish = GeneratedColumn( + late final GeneratedColumn finish = GeneratedColumn( 'finish', aliasedName, false, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: true, ); static const VerificationMeta _statusMeta = const VerificationMeta('status'); @@ -13626,26 +13966,28 @@ class $DiscountCampaignsTable extends DiscountCampaigns 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -13752,11 +14094,11 @@ class $DiscountCampaignsTable extends DiscountCampaigns data['${effectivePrefix}name'], ), start: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}start'], )!, finish: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}finish'], )!, status: attachedDatabase.typeMapping.read( @@ -13770,11 +14112,11 @@ class $DiscountCampaignsTable extends DiscountCampaigns )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -13797,12 +14139,12 @@ class DiscountCampaign extends DataClass implements Insertable { final String id; final String? name; - final DateTime start; - final DateTime finish; + final PgDateTime start; + final PgDateTime finish; final String status; final List tags; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const DiscountCampaign({ required this.id, @@ -13822,16 +14164,22 @@ class DiscountCampaign extends DataClass if (!nullToAbsent || name != null) { map['name'] = Variable(name); } - map['start'] = Variable(start); - map['finish'] = Variable(finish); + map['start'] = Variable(start, PgTypes.timestampWithTimezone); + map['finish'] = Variable(finish, PgTypes.timestampWithTimezone); map['status'] = Variable(status); { map['tags'] = Variable( $DiscountCampaignsTable.$convertertags.toSql(tags), ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -13858,12 +14206,12 @@ class DiscountCampaign extends DataClass return DiscountCampaign( id: serializer.fromJson(json['id']), name: serializer.fromJson(json['name']), - start: serializer.fromJson(json['start']), - finish: serializer.fromJson(json['finish']), + start: serializer.fromJson(json['start']), + finish: serializer.fromJson(json['finish']), status: serializer.fromJson(json['status']), tags: serializer.fromJson>(json['tags']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -13873,12 +14221,12 @@ class DiscountCampaign extends DataClass return { 'id': serializer.toJson(id), 'name': serializer.toJson(name), - 'start': serializer.toJson(start), - 'finish': serializer.toJson(finish), + 'start': serializer.toJson(start), + 'finish': serializer.toJson(finish), 'status': serializer.toJson(status), 'tags': serializer.toJson>(tags), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -13886,12 +14234,12 @@ class DiscountCampaign extends DataClass DiscountCampaign copyWith({ String? id, Value name = const Value.absent(), - DateTime? start, - DateTime? finish, + PgDateTime? start, + PgDateTime? finish, String? status, List? tags, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => DiscountCampaign( id: id ?? this.id, @@ -13964,12 +14312,12 @@ class DiscountCampaign extends DataClass class DiscountCampaignsCompanion extends UpdateCompanion { final Value id; final Value name; - final Value start; - final Value finish; + final Value start; + final Value finish; final Value status; final Value> tags; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const DiscountCampaignsCompanion({ @@ -13987,8 +14335,8 @@ class DiscountCampaignsCompanion extends UpdateCompanion { DiscountCampaignsCompanion.insert({ this.id = const Value.absent(), this.name = const Value.absent(), - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, required String status, this.tags = const Value.absent(), this.createdAt = const Value.absent(), @@ -14001,12 +14349,12 @@ class DiscountCampaignsCompanion extends UpdateCompanion { static Insertable custom({ Expression? id, Expression? name, - Expression? start, - Expression? finish, + Expression? start, + Expression? finish, Expression? status, Expression? tags, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -14027,12 +14375,12 @@ class DiscountCampaignsCompanion extends UpdateCompanion { DiscountCampaignsCompanion copyWith({ Value? id, Value? name, - Value? start, - Value? finish, + Value? start, + Value? finish, Value? status, Value>? tags, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -14060,10 +14408,16 @@ class DiscountCampaignsCompanion extends UpdateCompanion { map['name'] = Variable(name.value); } if (start.present) { - map['start'] = Variable(start.value); + map['start'] = Variable( + start.value, + PgTypes.timestampWithTimezone, + ); } if (finish.present) { - map['finish'] = Variable(finish.value); + map['finish'] = Variable( + finish.value, + PgTypes.timestampWithTimezone, + ); } if (status.present) { map['status'] = Variable(status.value); @@ -14074,10 +14428,16 @@ class DiscountCampaignsCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -14120,7 +14480,7 @@ class $DiscountsTable extends Discounts false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _campaignIdMeta = const VerificationMeta( 'campaignId', @@ -14161,26 +14521,28 @@ class $DiscountsTable extends Discounts 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _isDeletedMeta = const VerificationMeta( 'isDeleted', ); @@ -14284,11 +14646,11 @@ class $DiscountsTable extends Discounts )!, ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, isDeleted: attachedDatabase.typeMapping.read( @@ -14312,8 +14674,8 @@ class Discount extends DataClass implements Insertable { final String campaignId; final double discountPercent; final List products; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; final bool isDeleted; const Discount({ required this.id, @@ -14335,8 +14697,14 @@ class Discount extends DataClass implements Insertable { $DiscountsTable.$converterproducts.toSql(products), ); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); map['is_deleted'] = Variable(isDeleted); return map; } @@ -14363,8 +14731,8 @@ class Discount extends DataClass implements Insertable { campaignId: serializer.fromJson(json['campaignId']), discountPercent: serializer.fromJson(json['discountPercent']), products: serializer.fromJson>(json['products']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), isDeleted: serializer.fromJson(json['isDeleted']), ); } @@ -14376,8 +14744,8 @@ class Discount extends DataClass implements Insertable { 'campaignId': serializer.toJson(campaignId), 'discountPercent': serializer.toJson(discountPercent), 'products': serializer.toJson>(products), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'isDeleted': serializer.toJson(isDeleted), }; } @@ -14387,8 +14755,8 @@ class Discount extends DataClass implements Insertable { String? campaignId, double? discountPercent, List? products, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, bool? isDeleted, }) => Discount( id: id ?? this.id, @@ -14457,8 +14825,8 @@ class DiscountsCompanion extends UpdateCompanion { final Value campaignId; final Value discountPercent; final Value> products; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value isDeleted; final Value rowid; const DiscountsCompanion({ @@ -14487,8 +14855,8 @@ class DiscountsCompanion extends UpdateCompanion { Expression? campaignId, Expression? discountPercent, Expression? products, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? isDeleted, Expression? rowid, }) { @@ -14509,8 +14877,8 @@ class DiscountsCompanion extends UpdateCompanion { Value? campaignId, Value? discountPercent, Value>? products, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? isDeleted, Value? rowid, }) { @@ -14544,10 +14912,16 @@ class DiscountsCompanion extends UpdateCompanion { ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (isDeleted.present) { map['is_deleted'] = Variable(isDeleted.value); @@ -14610,14 +14984,15 @@ class $DiscountUserDatasTable extends DiscountUserDatas 'grantedAt', ); @override - late final GeneratedColumn grantedAt = GeneratedColumn( - 'granted_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn grantedAt = + GeneratedColumn( + 'granted_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [discountId, userId, grantedAt]; @override @@ -14672,7 +15047,7 @@ class $DiscountUserDatasTable extends DiscountUserDatas data['${effectivePrefix}user_id'], )!, grantedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}granted_at'], )!, ); @@ -14688,7 +15063,7 @@ class DiscountUserData extends DataClass implements Insertable { final String discountId; final String userId; - final DateTime grantedAt; + final PgDateTime grantedAt; const DiscountUserData({ required this.discountId, required this.userId, @@ -14699,7 +15074,10 @@ class DiscountUserData extends DataClass final map = {}; map['discount_id'] = Variable(discountId); map['user_id'] = Variable(userId); - map['granted_at'] = Variable(grantedAt); + map['granted_at'] = Variable( + grantedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -14719,7 +15097,7 @@ class DiscountUserData extends DataClass return DiscountUserData( discountId: serializer.fromJson(json['discountId']), userId: serializer.fromJson(json['userId']), - grantedAt: serializer.fromJson(json['grantedAt']), + grantedAt: serializer.fromJson(json['grantedAt']), ); } @override @@ -14728,14 +15106,14 @@ class DiscountUserData extends DataClass return { 'discountId': serializer.toJson(discountId), 'userId': serializer.toJson(userId), - 'grantedAt': serializer.toJson(grantedAt), + 'grantedAt': serializer.toJson(grantedAt), }; } DiscountUserData copyWith({ String? discountId, String? userId, - DateTime? grantedAt, + PgDateTime? grantedAt, }) => DiscountUserData( discountId: discountId ?? this.discountId, userId: userId ?? this.userId, @@ -14775,7 +15153,7 @@ class DiscountUserData extends DataClass class DiscountUserDatasCompanion extends UpdateCompanion { final Value discountId; final Value userId; - final Value grantedAt; + final Value grantedAt; final Value rowid; const DiscountUserDatasCompanion({ this.discountId = const Value.absent(), @@ -14793,7 +15171,7 @@ class DiscountUserDatasCompanion extends UpdateCompanion { static Insertable custom({ Expression? discountId, Expression? userId, - Expression? grantedAt, + Expression? grantedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -14807,7 +15185,7 @@ class DiscountUserDatasCompanion extends UpdateCompanion { DiscountUserDatasCompanion copyWith({ Value? discountId, Value? userId, - Value? grantedAt, + Value? grantedAt, Value? rowid, }) { return DiscountUserDatasCompanion( @@ -14828,7 +15206,10 @@ class DiscountUserDatasCompanion extends UpdateCompanion { map['user_id'] = Variable(userId.value); } if (grantedAt.present) { - map['granted_at'] = Variable(grantedAt.value); + map['granted_at'] = Variable( + grantedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -14862,7 +15243,7 @@ class $StudySessionsTable extends StudySessions false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -14892,22 +15273,23 @@ class $StudySessionsTable extends StudySessions 'startTime', ); @override - late final GeneratedColumn startTime = GeneratedColumn( - 'start_time', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: true, - ); + late final GeneratedColumn startTime = + GeneratedColumn( + 'start_time', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: true, + ); static const VerificationMeta _endTimeMeta = const VerificationMeta( 'endTime', ); @override - late final GeneratedColumn endTime = GeneratedColumn( + late final GeneratedColumn endTime = GeneratedColumn( 'end_time', aliasedName, true, - type: DriftSqlType.dateTime, + type: PgTypes.timestampWithTimezone, requiredDuringInsert: false, ); static const VerificationMeta _wordsLearnedMeta = const VerificationMeta( @@ -14968,26 +15350,28 @@ class $StudySessionsTable extends StudySessions 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -15116,11 +15500,11 @@ class $StudySessionsTable extends StudySessions data['${effectivePrefix}session_id'], ), startTime: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}start_time'], )!, endTime: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}end_time'], ), wordsLearned: attachedDatabase.typeMapping.read( @@ -15144,11 +15528,11 @@ class $StudySessionsTable extends StudySessions data['${effectivePrefix}test_id'], ), createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -15164,15 +15548,15 @@ class StudySession extends DataClass implements Insertable { final String id; final String userId; final String? sessionId; - final DateTime startTime; - final DateTime? endTime; + final PgDateTime startTime; + final PgDateTime? endTime; final int wordsLearned; final int testsCompleted; final double accuracy; final String? packId; final String? testId; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const StudySession({ required this.id, required this.userId, @@ -15195,9 +15579,15 @@ class StudySession extends DataClass implements Insertable { if (!nullToAbsent || sessionId != null) { map['session_id'] = Variable(sessionId); } - map['start_time'] = Variable(startTime); + map['start_time'] = Variable( + startTime, + PgTypes.timestampWithTimezone, + ); if (!nullToAbsent || endTime != null) { - map['end_time'] = Variable(endTime); + map['end_time'] = Variable( + endTime, + PgTypes.timestampWithTimezone, + ); } map['words_learned'] = Variable(wordsLearned); map['tests_completed'] = Variable(testsCompleted); @@ -15208,8 +15598,14 @@ class StudySession extends DataClass implements Insertable { if (!nullToAbsent || testId != null) { map['test_id'] = Variable(testId); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -15247,15 +15643,15 @@ class StudySession extends DataClass implements Insertable { id: serializer.fromJson(json['id']), userId: serializer.fromJson(json['userId']), sessionId: serializer.fromJson(json['sessionId']), - startTime: serializer.fromJson(json['startTime']), - endTime: serializer.fromJson(json['endTime']), + startTime: serializer.fromJson(json['startTime']), + endTime: serializer.fromJson(json['endTime']), wordsLearned: serializer.fromJson(json['wordsLearned']), testsCompleted: serializer.fromJson(json['testsCompleted']), accuracy: serializer.fromJson(json['accuracy']), packId: serializer.fromJson(json['packId']), testId: serializer.fromJson(json['testId']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -15265,15 +15661,15 @@ class StudySession extends DataClass implements Insertable { 'id': serializer.toJson(id), 'userId': serializer.toJson(userId), 'sessionId': serializer.toJson(sessionId), - 'startTime': serializer.toJson(startTime), - 'endTime': serializer.toJson(endTime), + 'startTime': serializer.toJson(startTime), + 'endTime': serializer.toJson(endTime), 'wordsLearned': serializer.toJson(wordsLearned), 'testsCompleted': serializer.toJson(testsCompleted), 'accuracy': serializer.toJson(accuracy), 'packId': serializer.toJson(packId), 'testId': serializer.toJson(testId), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -15281,15 +15677,15 @@ class StudySession extends DataClass implements Insertable { String? id, String? userId, Value sessionId = const Value.absent(), - DateTime? startTime, - Value endTime = const Value.absent(), + PgDateTime? startTime, + Value endTime = const Value.absent(), int? wordsLearned, int? testsCompleted, double? accuracy, Value packId = const Value.absent(), Value testId = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => StudySession( id: id ?? this.id, userId: userId ?? this.userId, @@ -15381,15 +15777,15 @@ class StudySessionsCompanion extends UpdateCompanion { final Value id; final Value userId; final Value sessionId; - final Value startTime; - final Value endTime; + final Value startTime; + final Value endTime; final Value wordsLearned; final Value testsCompleted; final Value accuracy; final Value packId; final Value testId; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const StudySessionsCompanion({ this.id = const Value.absent(), @@ -15410,7 +15806,7 @@ class StudySessionsCompanion extends UpdateCompanion { this.id = const Value.absent(), required String userId, this.sessionId = const Value.absent(), - required DateTime startTime, + required PgDateTime startTime, this.endTime = const Value.absent(), this.wordsLearned = const Value.absent(), this.testsCompleted = const Value.absent(), @@ -15426,15 +15822,15 @@ class StudySessionsCompanion extends UpdateCompanion { Expression? id, Expression? userId, Expression? sessionId, - Expression? startTime, - Expression? endTime, + Expression? startTime, + Expression? endTime, Expression? wordsLearned, Expression? testsCompleted, Expression? accuracy, Expression? packId, Expression? testId, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -15458,15 +15854,15 @@ class StudySessionsCompanion extends UpdateCompanion { Value? id, Value? userId, Value? sessionId, - Value? startTime, - Value? endTime, + Value? startTime, + Value? endTime, Value? wordsLearned, Value? testsCompleted, Value? accuracy, Value? packId, Value? testId, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return StudySessionsCompanion( @@ -15499,10 +15895,16 @@ class StudySessionsCompanion extends UpdateCompanion { map['session_id'] = Variable(sessionId.value); } if (startTime.present) { - map['start_time'] = Variable(startTime.value); + map['start_time'] = Variable( + startTime.value, + PgTypes.timestampWithTimezone, + ); } if (endTime.present) { - map['end_time'] = Variable(endTime.value); + map['end_time'] = Variable( + endTime.value, + PgTypes.timestampWithTimezone, + ); } if (wordsLearned.present) { map['words_learned'] = Variable(wordsLearned.value); @@ -15520,10 +15922,16 @@ class StudySessionsCompanion extends UpdateCompanion { map['test_id'] = Variable(testId.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -15566,7 +15974,7 @@ class $UserAchievementsTable extends UserAchievements false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); @override @@ -15595,14 +16003,15 @@ class $UserAchievementsTable extends UserAchievements 'unlockedAt', ); @override - late final GeneratedColumn unlockedAt = GeneratedColumn( - 'unlocked_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn unlockedAt = + GeneratedColumn( + 'unlocked_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _progressMeta = const VerificationMeta( 'progress', ); @@ -15619,26 +16028,28 @@ class $UserAchievementsTable extends UserAchievements 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -15729,7 +16140,7 @@ class $UserAchievementsTable extends UserAchievements data['${effectivePrefix}achievement_id'], )!, unlockedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}unlocked_at'], )!, progress: attachedDatabase.typeMapping.read( @@ -15737,11 +16148,11 @@ class $UserAchievementsTable extends UserAchievements data['${effectivePrefix}progress'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -15757,10 +16168,10 @@ class UserAchievement extends DataClass implements Insertable { final String id; final String userId; final String achievementId; - final DateTime unlockedAt; + final PgDateTime unlockedAt; final double progress; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const UserAchievement({ required this.id, required this.userId, @@ -15776,10 +16187,19 @@ class UserAchievement extends DataClass implements Insertable { map['id'] = Variable(id); map['user_id'] = Variable(userId); map['achievement_id'] = Variable(achievementId); - map['unlocked_at'] = Variable(unlockedAt); + map['unlocked_at'] = Variable( + unlockedAt, + PgTypes.timestampWithTimezone, + ); map['progress'] = Variable(progress); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -15804,10 +16224,10 @@ class UserAchievement extends DataClass implements Insertable { id: serializer.fromJson(json['id']), userId: serializer.fromJson(json['userId']), achievementId: serializer.fromJson(json['achievementId']), - unlockedAt: serializer.fromJson(json['unlockedAt']), + unlockedAt: serializer.fromJson(json['unlockedAt']), progress: serializer.fromJson(json['progress']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -15817,10 +16237,10 @@ class UserAchievement extends DataClass implements Insertable { 'id': serializer.toJson(id), 'userId': serializer.toJson(userId), 'achievementId': serializer.toJson(achievementId), - 'unlockedAt': serializer.toJson(unlockedAt), + 'unlockedAt': serializer.toJson(unlockedAt), 'progress': serializer.toJson(progress), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -15828,10 +16248,10 @@ class UserAchievement extends DataClass implements Insertable { String? id, String? userId, String? achievementId, - DateTime? unlockedAt, + PgDateTime? unlockedAt, double? progress, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => UserAchievement( id: id ?? this.id, userId: userId ?? this.userId, @@ -15898,10 +16318,10 @@ class UserAchievementsCompanion extends UpdateCompanion { final Value id; final Value userId; final Value achievementId; - final Value unlockedAt; + final Value unlockedAt; final Value progress; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const UserAchievementsCompanion({ this.id = const Value.absent(), @@ -15928,10 +16348,10 @@ class UserAchievementsCompanion extends UpdateCompanion { Expression? id, Expression? userId, Expression? achievementId, - Expression? unlockedAt, + Expression? unlockedAt, Expression? progress, - Expression? createdAt, - Expression? updatedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -15950,10 +16370,10 @@ class UserAchievementsCompanion extends UpdateCompanion { Value? id, Value? userId, Value? achievementId, - Value? unlockedAt, + Value? unlockedAt, Value? progress, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return UserAchievementsCompanion( @@ -15981,16 +16401,25 @@ class UserAchievementsCompanion extends UpdateCompanion { map['achievement_id'] = Variable(achievementId.value); } if (unlockedAt.present) { - map['unlocked_at'] = Variable(unlockedAt.value); + map['unlocked_at'] = Variable( + unlockedAt.value, + PgTypes.timestampWithTimezone, + ); } if (progress.present) { map['progress'] = Variable(progress.value); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -16028,7 +16457,7 @@ class $ShareRequestsTable extends ShareRequests false, type: DriftSqlType.string, requiredDuringInsert: false, - defaultValue: const Constant('gen_random_uuid()'), + defaultValue: const CustomExpression('gen_random_uuid()::text'), ); static const VerificationMeta _telegramUserIdMeta = const VerificationMeta( 'telegramUserId', @@ -16067,38 +16496,41 @@ class $ShareRequestsTable extends ShareRequests 'requestedAt', ); @override - late final GeneratedColumn requestedAt = GeneratedColumn( - 'requested_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn requestedAt = + GeneratedColumn( + 'requested_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _createdAtMeta = const VerificationMeta( 'createdAt', ); @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn createdAt = + GeneratedColumn( + 'created_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); static const VerificationMeta _updatedAtMeta = const VerificationMeta( 'updatedAt', ); @override - late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', - aliasedName, - false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentTimestamp, - ); + late final GeneratedColumn updatedAt = + GeneratedColumn( + 'updated_at', + aliasedName, + false, + type: PgTypes.timestampWithTimezone, + requiredDuringInsert: false, + defaultValue: now(), + ); @override List get $columns => [ id, @@ -16200,15 +16632,15 @@ class $ShareRequestsTable extends ShareRequests data['${effectivePrefix}shared_card_id'], ), requestedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}requested_at'], )!, createdAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}created_at'], )!, updatedAt: attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, + PgTypes.timestampWithTimezone, data['${effectivePrefix}updated_at'], )!, ); @@ -16225,9 +16657,9 @@ class ShareRequest extends DataClass implements Insertable { final String telegramUserId; final String? telegramUsername; final String? sharedCardId; - final DateTime requestedAt; - final DateTime createdAt; - final DateTime updatedAt; + final PgDateTime requestedAt; + final PgDateTime createdAt; + final PgDateTime updatedAt; const ShareRequest({ required this.id, required this.telegramUserId, @@ -16248,9 +16680,18 @@ class ShareRequest extends DataClass implements Insertable { if (!nullToAbsent || sharedCardId != null) { map['shared_card_id'] = Variable(sharedCardId); } - map['requested_at'] = Variable(requestedAt); - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + map['requested_at'] = Variable( + requestedAt, + PgTypes.timestampWithTimezone, + ); + map['created_at'] = Variable( + createdAt, + PgTypes.timestampWithTimezone, + ); + map['updated_at'] = Variable( + updatedAt, + PgTypes.timestampWithTimezone, + ); return map; } @@ -16280,9 +16721,9 @@ class ShareRequest extends DataClass implements Insertable { telegramUserId: serializer.fromJson(json['telegramUserId']), telegramUsername: serializer.fromJson(json['telegramUsername']), sharedCardId: serializer.fromJson(json['sharedCardId']), - requestedAt: serializer.fromJson(json['requestedAt']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + requestedAt: serializer.fromJson(json['requestedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), ); } @override @@ -16293,9 +16734,9 @@ class ShareRequest extends DataClass implements Insertable { 'telegramUserId': serializer.toJson(telegramUserId), 'telegramUsername': serializer.toJson(telegramUsername), 'sharedCardId': serializer.toJson(sharedCardId), - 'requestedAt': serializer.toJson(requestedAt), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'requestedAt': serializer.toJson(requestedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), }; } @@ -16304,9 +16745,9 @@ class ShareRequest extends DataClass implements Insertable { String? telegramUserId, Value telegramUsername = const Value.absent(), Value sharedCardId = const Value.absent(), - DateTime? requestedAt, - DateTime? createdAt, - DateTime? updatedAt, + PgDateTime? requestedAt, + PgDateTime? createdAt, + PgDateTime? updatedAt, }) => ShareRequest( id: id ?? this.id, telegramUserId: telegramUserId ?? this.telegramUserId, @@ -16380,9 +16821,9 @@ class ShareRequestsCompanion extends UpdateCompanion { final Value telegramUserId; final Value telegramUsername; final Value sharedCardId; - final Value requestedAt; - final Value createdAt; - final Value updatedAt; + final Value requestedAt; + final Value createdAt; + final Value updatedAt; final Value rowid; const ShareRequestsCompanion({ this.id = const Value.absent(), @@ -16409,9 +16850,9 @@ class ShareRequestsCompanion extends UpdateCompanion { Expression? telegramUserId, Expression? telegramUsername, Expression? sharedCardId, - Expression? requestedAt, - Expression? createdAt, - Expression? updatedAt, + Expression? requestedAt, + Expression? createdAt, + Expression? updatedAt, Expression? rowid, }) { return RawValuesInsertable({ @@ -16431,9 +16872,9 @@ class ShareRequestsCompanion extends UpdateCompanion { Value? telegramUserId, Value? telegramUsername, Value? sharedCardId, - Value? requestedAt, - Value? createdAt, - Value? updatedAt, + Value? requestedAt, + Value? createdAt, + Value? updatedAt, Value? rowid, }) { return ShareRequestsCompanion( @@ -16464,13 +16905,22 @@ class ShareRequestsCompanion extends UpdateCompanion { map['shared_card_id'] = Variable(sharedCardId.value); } if (requestedAt.present) { - map['requested_at'] = Variable(requestedAt.value); + map['requested_at'] = Variable( + requestedAt.value, + PgTypes.timestampWithTimezone, + ); } if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); + map['created_at'] = Variable( + createdAt.value, + PgTypes.timestampWithTimezone, + ); } if (updatedAt.present) { - map['updated_at'] = Variable(updatedAt.value); + map['updated_at'] = Variable( + updatedAt.value, + PgTypes.timestampWithTimezone, + ); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -16801,8 +17251,8 @@ typedef $$UsersTableCreateCompanionBuilder = Value admin, Value userSettings, Value> purchases, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -16815,8 +17265,8 @@ typedef $$UsersTableUpdateCompanionBuilder = Value admin, Value userSettings, Value> purchases, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -17113,12 +17563,12 @@ class $$UsersTableFilterComposer extends Composer<_$AppDatabase, $UsersTable> { builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -17473,12 +17923,12 @@ class $$UsersTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -17523,10 +17973,10 @@ class $$UsersTableAnnotationComposer GeneratedColumnWithTypeConverter, String> get purchases => $composableBuilder(column: $table.purchases, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -17884,8 +18334,8 @@ class $$UsersTableTableManager Value admin = const Value.absent(), Value userSettings = const Value.absent(), Value> purchases = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => UsersCompanion( @@ -17910,8 +18360,8 @@ class $$UsersTableTableManager Value admin = const Value.absent(), Value userSettings = const Value.absent(), Value> purchases = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => UsersCompanion.insert( @@ -18239,8 +18689,8 @@ typedef $$UserDatasTableCreateCompanionBuilder = Value longestStreak, Value totalCards, Value totalTests, - Value lastTimeOnline, - Value registrationDate, + Value lastTimeOnline, + Value registrationDate, Value lastTestSessionToken, Value> words, Value> tags, @@ -18248,8 +18698,8 @@ typedef $$UserDatasTableCreateCompanionBuilder = Value?> studyDates, Value> achievements, Value?> categoryMinutes, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$UserDatasTableUpdateCompanionBuilder = @@ -18261,8 +18711,8 @@ typedef $$UserDatasTableUpdateCompanionBuilder = Value longestStreak, Value totalCards, Value totalTests, - Value lastTimeOnline, - Value registrationDate, + Value lastTimeOnline, + Value registrationDate, Value lastTestSessionToken, Value> words, Value> tags, @@ -18270,8 +18720,8 @@ typedef $$UserDatasTableUpdateCompanionBuilder = Value?> studyDates, Value> achievements, Value?> categoryMinutes, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -18337,12 +18787,12 @@ class $$UserDatasTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get lastTimeOnline => $composableBuilder( + ColumnFilters get lastTimeOnline => $composableBuilder( column: $table.lastTimeOnline, builder: (column) => ColumnFilters(column), ); - ColumnFilters get registrationDate => $composableBuilder( + ColumnFilters get registrationDate => $composableBuilder( column: $table.registrationDate, builder: (column) => ColumnFilters(column), ); @@ -18392,12 +18842,12 @@ class $$UserDatasTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -18465,12 +18915,12 @@ class $$UserDatasTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get lastTimeOnline => $composableBuilder( + ColumnOrderings get lastTimeOnline => $composableBuilder( column: $table.lastTimeOnline, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get registrationDate => $composableBuilder( + ColumnOrderings get registrationDate => $composableBuilder( column: $table.registrationDate, builder: (column) => ColumnOrderings(column), ); @@ -18510,12 +18960,12 @@ class $$UserDatasTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -18581,12 +19031,12 @@ class $$UserDatasTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get lastTimeOnline => $composableBuilder( + GeneratedColumn get lastTimeOnline => $composableBuilder( column: $table.lastTimeOnline, builder: (column) => column, ); - GeneratedColumn get registrationDate => $composableBuilder( + GeneratedColumn get registrationDate => $composableBuilder( column: $table.registrationDate, builder: (column) => column, ); @@ -18626,10 +19076,10 @@ class $$UserDatasTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -18691,8 +19141,8 @@ class $$UserDatasTableTableManager Value longestStreak = const Value.absent(), Value totalCards = const Value.absent(), Value totalTests = const Value.absent(), - Value lastTimeOnline = const Value.absent(), - Value registrationDate = const Value.absent(), + Value lastTimeOnline = const Value.absent(), + Value registrationDate = const Value.absent(), Value lastTestSessionToken = const Value.absent(), Value> words = const Value.absent(), Value> tags = const Value.absent(), @@ -18701,8 +19151,8 @@ class $$UserDatasTableTableManager Value> achievements = const Value.absent(), Value?> categoryMinutes = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserDatasCompanion( id: id, @@ -18734,8 +19184,8 @@ class $$UserDatasTableTableManager Value longestStreak = const Value.absent(), Value totalCards = const Value.absent(), Value totalTests = const Value.absent(), - Value lastTimeOnline = const Value.absent(), - Value registrationDate = const Value.absent(), + Value lastTimeOnline = const Value.absent(), + Value registrationDate = const Value.absent(), Value lastTestSessionToken = const Value.absent(), Value> words = const Value.absent(), Value> tags = const Value.absent(), @@ -18744,8 +19194,8 @@ class $$UserDatasTableTableManager Value> achievements = const Value.absent(), Value?> categoryMinutes = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserDatasCompanion.insert( id: id, @@ -18841,8 +19291,8 @@ typedef $$TokensTableCreateCompanionBuilder = required String userId, required String token, required String externalUserId, - Value created, - required DateTime expires, + Value created, + required PgDateTime expires, Value rowid, }); typedef $$TokensTableUpdateCompanionBuilder = @@ -18851,8 +19301,8 @@ typedef $$TokensTableUpdateCompanionBuilder = Value userId, Value token, Value externalUserId, - Value created, - Value expires, + Value created, + Value expires, Value rowid, }); @@ -18902,12 +19352,12 @@ class $$TokensTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get created => $composableBuilder( + ColumnFilters get created => $composableBuilder( column: $table.created, builder: (column) => ColumnFilters(column), ); - ColumnFilters get expires => $composableBuilder( + ColumnFilters get expires => $composableBuilder( column: $table.expires, builder: (column) => ColumnFilters(column), ); @@ -18960,12 +19410,12 @@ class $$TokensTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get created => $composableBuilder( + ColumnOrderings get created => $composableBuilder( column: $table.created, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get expires => $composableBuilder( + ColumnOrderings get expires => $composableBuilder( column: $table.expires, builder: (column) => ColumnOrderings(column), ); @@ -19014,10 +19464,10 @@ class $$TokensTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get created => + GeneratedColumn get created => $composableBuilder(column: $table.created, builder: (column) => column); - GeneratedColumn get expires => + GeneratedColumn get expires => $composableBuilder(column: $table.expires, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -19076,8 +19526,8 @@ class $$TokensTableTableManager Value userId = const Value.absent(), Value token = const Value.absent(), Value externalUserId = const Value.absent(), - Value created = const Value.absent(), - Value expires = const Value.absent(), + Value created = const Value.absent(), + Value expires = const Value.absent(), Value rowid = const Value.absent(), }) => TokensCompanion( id: id, @@ -19094,8 +19544,8 @@ class $$TokensTableTableManager required String userId, required String token, required String externalUserId, - Value created = const Value.absent(), - required DateTime expires, + Value created = const Value.absent(), + required PgDateTime expires, Value rowid = const Value.absent(), }) => TokensCompanion.insert( id: id, @@ -19177,8 +19627,8 @@ typedef $$RefreshTokensTableCreateCompanionBuilder = required String userId, required String jti, Value isBlacklisted, - Value createdAt, - required DateTime expiresAt, + Value createdAt, + required PgDateTime expiresAt, Value rowid, }); typedef $$RefreshTokensTableUpdateCompanionBuilder = @@ -19187,8 +19637,8 @@ typedef $$RefreshTokensTableUpdateCompanionBuilder = Value userId, Value jti, Value isBlacklisted, - Value createdAt, - Value expiresAt, + Value createdAt, + Value expiresAt, Value rowid, }); @@ -19243,12 +19693,12 @@ class $$RefreshTokensTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get expiresAt => $composableBuilder( + ColumnFilters get expiresAt => $composableBuilder( column: $table.expiresAt, builder: (column) => ColumnFilters(column), ); @@ -19301,12 +19751,12 @@ class $$RefreshTokensTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get expiresAt => $composableBuilder( + ColumnOrderings get expiresAt => $composableBuilder( column: $table.expiresAt, builder: (column) => ColumnOrderings(column), ); @@ -19355,10 +19805,10 @@ class $$RefreshTokensTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get expiresAt => + GeneratedColumn get expiresAt => $composableBuilder(column: $table.expiresAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -19417,8 +19867,8 @@ class $$RefreshTokensTableTableManager Value userId = const Value.absent(), Value jti = const Value.absent(), Value isBlacklisted = const Value.absent(), - Value createdAt = const Value.absent(), - Value expiresAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value expiresAt = const Value.absent(), Value rowid = const Value.absent(), }) => RefreshTokensCompanion( id: id, @@ -19435,8 +19885,8 @@ class $$RefreshTokensTableTableManager required String userId, required String jti, Value isBlacklisted = const Value.absent(), - Value createdAt = const Value.absent(), - required DateTime expiresAt, + Value createdAt = const Value.absent(), + required PgDateTime expiresAt, Value rowid = const Value.absent(), }) => RefreshTokensCompanion.insert( id: id, @@ -19523,9 +19973,9 @@ typedef $$TelegramAuthCodesTableCreateCompanionBuilder = Value firstName, Value lastName, Value isUsed, - Value usedAt, - Value createdAt, - required DateTime expiresAt, + Value usedAt, + Value createdAt, + required PgDateTime expiresAt, Value rowid, }); typedef $$TelegramAuthCodesTableUpdateCompanionBuilder = @@ -19537,9 +19987,9 @@ typedef $$TelegramAuthCodesTableUpdateCompanionBuilder = Value firstName, Value lastName, Value isUsed, - Value usedAt, - Value createdAt, - Value expiresAt, + Value usedAt, + Value createdAt, + Value expiresAt, Value rowid, }); @@ -19587,17 +20037,17 @@ class $$TelegramAuthCodesTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get usedAt => $composableBuilder( + ColumnFilters get usedAt => $composableBuilder( column: $table.usedAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get expiresAt => $composableBuilder( + ColumnFilters get expiresAt => $composableBuilder( column: $table.expiresAt, builder: (column) => ColumnFilters(column), ); @@ -19647,17 +20097,17 @@ class $$TelegramAuthCodesTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get usedAt => $composableBuilder( + ColumnOrderings get usedAt => $composableBuilder( column: $table.usedAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get expiresAt => $composableBuilder( + ColumnOrderings get expiresAt => $composableBuilder( column: $table.expiresAt, builder: (column) => ColumnOrderings(column), ); @@ -19697,13 +20147,13 @@ class $$TelegramAuthCodesTableAnnotationComposer GeneratedColumn get isUsed => $composableBuilder(column: $table.isUsed, builder: (column) => column); - GeneratedColumn get usedAt => + GeneratedColumn get usedAt => $composableBuilder(column: $table.usedAt, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get expiresAt => + GeneratedColumn get expiresAt => $composableBuilder(column: $table.expiresAt, builder: (column) => column); } @@ -19754,9 +20204,9 @@ class $$TelegramAuthCodesTableTableManager Value firstName = const Value.absent(), Value lastName = const Value.absent(), Value isUsed = const Value.absent(), - Value usedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value expiresAt = const Value.absent(), + Value usedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value expiresAt = const Value.absent(), Value rowid = const Value.absent(), }) => TelegramAuthCodesCompanion( id: id, @@ -19780,9 +20230,9 @@ class $$TelegramAuthCodesTableTableManager Value firstName = const Value.absent(), Value lastName = const Value.absent(), Value isUsed = const Value.absent(), - Value usedAt = const Value.absent(), - Value createdAt = const Value.absent(), - required DateTime expiresAt, + Value usedAt = const Value.absent(), + Value createdAt = const Value.absent(), + required PgDateTime expiresAt, Value rowid = const Value.absent(), }) => TelegramAuthCodesCompanion.insert( id: id, @@ -19844,8 +20294,8 @@ typedef $$CardPacksTableCreateCompanionBuilder = Value appStoreId, Value price, Value currency, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -19867,8 +20317,8 @@ typedef $$CardPacksTableUpdateCompanionBuilder = Value appStoreId, Value price, Value currency, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -20064,12 +20514,12 @@ class $$CardPacksTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -20294,12 +20744,12 @@ class $$CardPacksTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -20376,10 +20826,10 @@ class $$CardPacksTableAnnotationComposer GeneratedColumn get currency => $composableBuilder(column: $table.currency, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -20562,8 +21012,8 @@ class $$CardPacksTableTableManager Value appStoreId = const Value.absent(), Value price = const Value.absent(), Value currency = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => CardPacksCompanion( @@ -20606,8 +21056,8 @@ class $$CardPacksTableTableManager Value appStoreId = const Value.absent(), Value price = const Value.absent(), Value currency = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => CardPacksCompanion.insert( @@ -20805,8 +21255,8 @@ typedef $$GameCardsTableCreateCompanionBuilder = Value transcription, Value transcriptionMnemo, Value back, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -20822,8 +21272,8 @@ typedef $$GameCardsTableUpdateCompanionBuilder = Value transcription, Value transcriptionMnemo, Value back, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -20976,12 +21426,12 @@ class $$GameCardsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -21169,12 +21619,12 @@ class $$GameCardsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -21250,10 +21700,10 @@ class $$GameCardsTableAnnotationComposer GeneratedColumn get back => $composableBuilder(column: $table.back, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -21427,8 +21877,8 @@ class $$GameCardsTableTableManager Value transcription = const Value.absent(), Value transcriptionMnemo = const Value.absent(), Value back = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => GameCardsCompanion( @@ -21459,8 +21909,8 @@ class $$GameCardsTableTableManager Value transcription = const Value.absent(), Value transcriptionMnemo = const Value.absent(), Value back = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => GameCardsCompanion.insert( @@ -21655,7 +22105,7 @@ typedef $$VoiceModelsTableCreateCompanionBuilder = required String cardId, required String voiceUrl, required String language, - Value createdAt, + Value createdAt, Value rowid, }); typedef $$VoiceModelsTableUpdateCompanionBuilder = @@ -21664,7 +22114,7 @@ typedef $$VoiceModelsTableUpdateCompanionBuilder = Value cardId, Value voiceUrl, Value language, - Value createdAt, + Value createdAt, Value rowid, }); @@ -21734,7 +22184,7 @@ class $$VoiceModelsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); @@ -21812,7 +22262,7 @@ class $$VoiceModelsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); @@ -21859,7 +22309,7 @@ class $$VoiceModelsTableAnnotationComposer GeneratedColumn get language => $composableBuilder(column: $table.language, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); $$GameCardsTableAnnotationComposer get cardId { @@ -21943,7 +22393,7 @@ class $$VoiceModelsTableTableManager Value cardId = const Value.absent(), Value voiceUrl = const Value.absent(), Value language = const Value.absent(), - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), }) => VoiceModelsCompanion( id: id, @@ -21959,7 +22409,7 @@ class $$VoiceModelsTableTableManager required String cardId, required String voiceUrl, required String language, - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), }) => VoiceModelsCompanion.insert( id: id, @@ -22060,7 +22510,7 @@ typedef $$UserPacksTableCreateCompanionBuilder = UserPacksCompanion Function({ required String userId, required String packId, - Value grantedAt, + Value grantedAt, Value grantType, Value rowid, }); @@ -22068,7 +22518,7 @@ typedef $$UserPacksTableUpdateCompanionBuilder = UserPacksCompanion Function({ Value userId, Value packId, - Value grantedAt, + Value grantedAt, Value grantType, Value rowid, }); @@ -22122,7 +22572,7 @@ class $$UserPacksTableFilterComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnFilters get grantedAt => $composableBuilder( + ColumnFilters get grantedAt => $composableBuilder( column: $table.grantedAt, builder: (column) => ColumnFilters(column), ); @@ -22188,7 +22638,7 @@ class $$UserPacksTableOrderingComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnOrderings get grantedAt => $composableBuilder( + ColumnOrderings get grantedAt => $composableBuilder( column: $table.grantedAt, builder: (column) => ColumnOrderings(column), ); @@ -22254,7 +22704,7 @@ class $$UserPacksTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get grantedAt => + GeneratedColumn get grantedAt => $composableBuilder(column: $table.grantedAt, builder: (column) => column); GeneratedColumn get grantType => @@ -22337,7 +22787,7 @@ class $$UserPacksTableTableManager ({ Value userId = const Value.absent(), Value packId = const Value.absent(), - Value grantedAt = const Value.absent(), + Value grantedAt = const Value.absent(), Value grantType = const Value.absent(), Value rowid = const Value.absent(), }) => UserPacksCompanion( @@ -22351,7 +22801,7 @@ class $$UserPacksTableTableManager ({ required String userId, required String packId, - Value grantedAt = const Value.absent(), + Value grantedAt = const Value.absent(), Value grantType = const Value.absent(), Value rowid = const Value.absent(), }) => UserPacksCompanion.insert( @@ -23541,8 +23991,8 @@ typedef $$SubscriptionPlansTableCreateCompanionBuilder = Value> features, Value paymentId, required String paymentSystem, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -23556,8 +24006,8 @@ typedef $$SubscriptionPlansTableUpdateCompanionBuilder = Value> features, Value paymentId, Value paymentSystem, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -23617,12 +24067,12 @@ class $$SubscriptionPlansTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -23682,12 +24132,12 @@ class $$SubscriptionPlansTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -23735,10 +24185,10 @@ class $$SubscriptionPlansTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -23793,8 +24243,8 @@ class $$SubscriptionPlansTableTableManager Value> features = const Value.absent(), Value paymentId = const Value.absent(), Value paymentSystem = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => SubscriptionPlansCompanion( @@ -23821,8 +24271,8 @@ class $$SubscriptionPlansTableTableManager Value> features = const Value.absent(), Value paymentId = const Value.absent(), required String paymentSystem, - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => SubscriptionPlansCompanion.insert( @@ -23872,22 +24322,22 @@ typedef $$UserSubscriptionsTableCreateCompanionBuilder = UserSubscriptionsCompanion Function({ Value id, required String userId, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, Value> features, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$UserSubscriptionsTableUpdateCompanionBuilder = UserSubscriptionsCompanion Function({ Value id, Value userId, - Value start, - Value finish, + Value start, + Value finish, Value> features, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -23937,12 +24387,12 @@ class $$UserSubscriptionsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get start => $composableBuilder( + ColumnFilters get start => $composableBuilder( column: $table.start, builder: (column) => ColumnFilters(column), ); - ColumnFilters get finish => $composableBuilder( + ColumnFilters get finish => $composableBuilder( column: $table.finish, builder: (column) => ColumnFilters(column), ); @@ -23953,12 +24403,12 @@ class $$UserSubscriptionsTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -24001,12 +24451,12 @@ class $$UserSubscriptionsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get start => $composableBuilder( + ColumnOrderings get start => $composableBuilder( column: $table.start, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get finish => $composableBuilder( + ColumnOrderings get finish => $composableBuilder( column: $table.finish, builder: (column) => ColumnOrderings(column), ); @@ -24016,12 +24466,12 @@ class $$UserSubscriptionsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -24062,19 +24512,19 @@ class $$UserSubscriptionsTableAnnotationComposer GeneratedColumn get id => $composableBuilder(column: $table.id, builder: (column) => column); - GeneratedColumn get start => + GeneratedColumn get start => $composableBuilder(column: $table.start, builder: (column) => column); - GeneratedColumn get finish => + GeneratedColumn get finish => $composableBuilder(column: $table.finish, builder: (column) => column); GeneratedColumnWithTypeConverter, String> get features => $composableBuilder(column: $table.features, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -24136,11 +24586,11 @@ class $$UserSubscriptionsTableTableManager ({ Value id = const Value.absent(), Value userId = const Value.absent(), - Value start = const Value.absent(), - Value finish = const Value.absent(), + Value start = const Value.absent(), + Value finish = const Value.absent(), Value> features = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserSubscriptionsCompanion( id: id, @@ -24156,11 +24606,11 @@ class $$UserSubscriptionsTableTableManager ({ Value id = const Value.absent(), required String userId, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, Value> features = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserSubscriptionsCompanion.insert( id: id, @@ -24251,12 +24701,12 @@ typedef $$PaymentsTableCreateCompanionBuilder = required String paymentSystem, Value externalToken, Value meta, - Value date, + Value date, Value> products, Value> packs, Value subscription, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$PaymentsTableUpdateCompanionBuilder = @@ -24269,12 +24719,12 @@ typedef $$PaymentsTableUpdateCompanionBuilder = Value paymentSystem, Value externalToken, Value meta, - Value date, + Value date, Value> products, Value> packs, Value subscription, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -24345,7 +24795,7 @@ class $$PaymentsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get date => $composableBuilder( + ColumnFilters get date => $composableBuilder( column: $table.date, builder: (column) => ColumnFilters(column), ); @@ -24367,12 +24817,12 @@ class $$PaymentsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -24445,7 +24895,7 @@ class $$PaymentsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get date => $composableBuilder( + ColumnOrderings get date => $composableBuilder( column: $table.date, builder: (column) => ColumnOrderings(column), ); @@ -24465,12 +24915,12 @@ class $$PaymentsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -24533,7 +24983,7 @@ class $$PaymentsTableAnnotationComposer GeneratedColumn get meta => $composableBuilder(column: $table.meta, builder: (column) => column); - GeneratedColumn get date => + GeneratedColumn get date => $composableBuilder(column: $table.date, builder: (column) => column); GeneratedColumnWithTypeConverter, String> get products => @@ -24547,10 +24997,10 @@ class $$PaymentsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -24613,12 +25063,12 @@ class $$PaymentsTableTableManager Value paymentSystem = const Value.absent(), Value externalToken = const Value.absent(), Value meta = const Value.absent(), - Value date = const Value.absent(), + Value date = const Value.absent(), Value> products = const Value.absent(), Value> packs = const Value.absent(), Value subscription = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => PaymentsCompanion( id: id, @@ -24647,12 +25097,12 @@ class $$PaymentsTableTableManager required String paymentSystem, Value externalToken = const Value.absent(), Value meta = const Value.absent(), - Value date = const Value.absent(), + Value date = const Value.absent(), Value> products = const Value.absent(), Value> packs = const Value.absent(), Value subscription = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => PaymentsCompanion.insert( id: id, @@ -24747,8 +25197,8 @@ typedef $$TestsTableCreateCompanionBuilder = Value version, Value time, Value timeSubtitle, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -24761,8 +25211,8 @@ typedef $$TestsTableUpdateCompanionBuilder = Value version, Value time, Value timeSubtitle, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -24875,12 +25325,12 @@ class $$TestsTableFilterComposer extends Composer<_$AppDatabase, $TestsTable> { builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -25010,12 +25460,12 @@ class $$TestsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -25058,10 +25508,10 @@ class $$TestsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -25183,8 +25633,8 @@ class $$TestsTableTableManager Value version = const Value.absent(), Value time = const Value.absent(), Value timeSubtitle = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => TestsCompanion( @@ -25209,8 +25659,8 @@ class $$TestsTableTableManager Value version = const Value.absent(), Value time = const Value.absent(), Value timeSubtitle = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => TestsCompanion.insert( @@ -25343,8 +25793,8 @@ typedef $$TestQuestionsTableCreateCompanionBuilder = required String testId, required String questionType, required String body, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$TestQuestionsTableUpdateCompanionBuilder = @@ -25353,8 +25803,8 @@ typedef $$TestQuestionsTableUpdateCompanionBuilder = Value testId, Value questionType, Value body, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -25409,12 +25859,12 @@ class $$TestQuestionsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -25467,12 +25917,12 @@ class $$TestQuestionsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -25521,10 +25971,10 @@ class $$TestQuestionsTableAnnotationComposer GeneratedColumn get body => $composableBuilder(column: $table.body, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$TestsTableAnnotationComposer get testId { @@ -25583,8 +26033,8 @@ class $$TestQuestionsTableTableManager Value testId = const Value.absent(), Value questionType = const Value.absent(), Value body = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => TestQuestionsCompanion( id: id, @@ -25601,8 +26051,8 @@ class $$TestQuestionsTableTableManager required String testId, required String questionType, required String body, - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => TestQuestionsCompanion.insert( id: id, @@ -26053,9 +26503,9 @@ typedef $$TestStatisticsTableCreateCompanionBuilder = required String userId, required String testId, Value?> results, - Value completedAt, - Value createdAt, - Value updatedAt, + Value completedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$TestStatisticsTableUpdateCompanionBuilder = @@ -26064,9 +26514,9 @@ typedef $$TestStatisticsTableUpdateCompanionBuilder = Value userId, Value testId, Value?> results, - Value completedAt, - Value createdAt, - Value updatedAt, + Value completedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -26126,17 +26576,17 @@ class $$TestStatisticsTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get completedAt => $composableBuilder( + ColumnFilters get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -26189,17 +26639,17 @@ class $$TestStatisticsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get completedAt => $composableBuilder( + ColumnOrderings get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -26246,15 +26696,15 @@ class $$TestStatisticsTableAnnotationComposer GeneratedColumnWithTypeConverter?, String> get results => $composableBuilder(column: $table.results, builder: (column) => column); - GeneratedColumn get completedAt => $composableBuilder( + GeneratedColumn get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$TestsTableAnnotationComposer get testId { @@ -26315,9 +26765,9 @@ class $$TestStatisticsTableTableManager Value userId = const Value.absent(), Value testId = const Value.absent(), Value?> results = const Value.absent(), - Value completedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value completedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => TestStatisticsCompanion( id: id, @@ -26335,9 +26785,9 @@ class $$TestStatisticsTableTableManager required String userId, required String testId, Value?> results = const Value.absent(), - Value completedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value completedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => TestStatisticsCompanion.insert( id: id, @@ -26427,9 +26877,9 @@ typedef $$TasksTableCreateCompanionBuilder = required int timeoutMillis, Value status, Value description, - Value lastExecution, - Value createdAt, - Value updatedAt, + Value lastExecution, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$TasksTableUpdateCompanionBuilder = @@ -26442,9 +26892,9 @@ typedef $$TasksTableUpdateCompanionBuilder = Value timeoutMillis, Value status, Value description, - Value lastExecution, - Value createdAt, - Value updatedAt, + Value lastExecution, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -26496,17 +26946,17 @@ class $$TasksTableFilterComposer extends Composer<_$AppDatabase, $TasksTable> { builder: (column) => ColumnFilters(column), ); - ColumnFilters get lastExecution => $composableBuilder( + ColumnFilters get lastExecution => $composableBuilder( column: $table.lastExecution, builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -26561,17 +27011,17 @@ class $$TasksTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get lastExecution => $composableBuilder( + ColumnOrderings get lastExecution => $composableBuilder( column: $table.lastExecution, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -26620,15 +27070,15 @@ class $$TasksTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get lastExecution => $composableBuilder( + GeneratedColumn get lastExecution => $composableBuilder( column: $table.lastExecution, builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); } @@ -26668,9 +27118,9 @@ class $$TasksTableTableManager Value timeoutMillis = const Value.absent(), Value status = const Value.absent(), Value description = const Value.absent(), - Value lastExecution = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value lastExecution = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => TasksCompanion( id: id, @@ -26696,9 +27146,9 @@ class $$TasksTableTableManager required int timeoutMillis, Value status = const Value.absent(), Value description = const Value.absent(), - Value lastExecution = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value lastExecution = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => TasksCompanion.insert( id: id, @@ -26745,14 +27195,14 @@ typedef $$UserTasksTableCreateCompanionBuilder = required String difficulty, required String status, Value> rewards, - Value createdAt, - required DateTime expiresAt, - Value completedAt, + Value createdAt, + required PgDateTime expiresAt, + Value completedAt, Value proofUrl, Value instructions, Value> tags, Value imageUrl, - Value updatedAt, + Value updatedAt, Value rowid, }); typedef $$UserTasksTableUpdateCompanionBuilder = @@ -26764,14 +27214,14 @@ typedef $$UserTasksTableUpdateCompanionBuilder = Value difficulty, Value status, Value> rewards, - Value createdAt, - Value expiresAt, - Value completedAt, + Value createdAt, + Value expiresAt, + Value completedAt, Value proofUrl, Value instructions, Value> tags, Value imageUrl, - Value updatedAt, + Value updatedAt, Value rowid, }); @@ -26820,17 +27270,17 @@ class $$UserTasksTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get expiresAt => $composableBuilder( + ColumnFilters get expiresAt => $composableBuilder( column: $table.expiresAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get completedAt => $composableBuilder( + ColumnFilters get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => ColumnFilters(column), ); @@ -26856,7 +27306,7 @@ class $$UserTasksTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -26906,17 +27356,17 @@ class $$UserTasksTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get expiresAt => $composableBuilder( + ColumnOrderings get expiresAt => $composableBuilder( column: $table.expiresAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get completedAt => $composableBuilder( + ColumnOrderings get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => ColumnOrderings(column), ); @@ -26941,7 +27391,7 @@ class $$UserTasksTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -26981,13 +27431,13 @@ class $$UserTasksTableAnnotationComposer GeneratedColumnWithTypeConverter, String> get rewards => $composableBuilder(column: $table.rewards, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get expiresAt => + GeneratedColumn get expiresAt => $composableBuilder(column: $table.expiresAt, builder: (column) => column); - GeneratedColumn get completedAt => $composableBuilder( + GeneratedColumn get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => column, ); @@ -27006,7 +27456,7 @@ class $$UserTasksTableAnnotationComposer GeneratedColumn get imageUrl => $composableBuilder(column: $table.imageUrl, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); } @@ -27045,14 +27495,14 @@ class $$UserTasksTableTableManager Value difficulty = const Value.absent(), Value status = const Value.absent(), Value> rewards = const Value.absent(), - Value createdAt = const Value.absent(), - Value expiresAt = const Value.absent(), - Value completedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value expiresAt = const Value.absent(), + Value completedAt = const Value.absent(), Value proofUrl = const Value.absent(), Value instructions = const Value.absent(), Value> tags = const Value.absent(), Value imageUrl = const Value.absent(), - Value updatedAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserTasksCompanion( id: id, @@ -27081,14 +27531,14 @@ class $$UserTasksTableTableManager required String difficulty, required String status, Value> rewards = const Value.absent(), - Value createdAt = const Value.absent(), - required DateTime expiresAt, - Value completedAt = const Value.absent(), + Value createdAt = const Value.absent(), + required PgDateTime expiresAt, + Value completedAt = const Value.absent(), Value proofUrl = const Value.absent(), Value instructions = const Value.absent(), Value> tags = const Value.absent(), Value imageUrl = const Value.absent(), - Value updatedAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserTasksCompanion.insert( id: id, @@ -27136,8 +27586,8 @@ typedef $$UserTaskProgressesTableCreateCompanionBuilder = required String userId, required String taskId, Value?> progress, - Value startedAt, - Value updatedAt, + Value startedAt, + Value updatedAt, Value rowid, }); typedef $$UserTaskProgressesTableUpdateCompanionBuilder = @@ -27146,8 +27596,8 @@ typedef $$UserTaskProgressesTableUpdateCompanionBuilder = Value userId, Value taskId, Value?> progress, - Value startedAt, - Value updatedAt, + Value startedAt, + Value updatedAt, Value rowid, }); @@ -27212,12 +27662,12 @@ class $$UserTaskProgressesTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get startedAt => $composableBuilder( + ColumnFilters get startedAt => $composableBuilder( column: $table.startedAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -27270,12 +27720,12 @@ class $$UserTaskProgressesTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get startedAt => $composableBuilder( + ColumnOrderings get startedAt => $composableBuilder( column: $table.startedAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -27323,10 +27773,10 @@ class $$UserTaskProgressesTableAnnotationComposer get progress => $composableBuilder(column: $table.progress, builder: (column) => column); - GeneratedColumn get startedAt => + GeneratedColumn get startedAt => $composableBuilder(column: $table.startedAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -27390,8 +27840,8 @@ class $$UserTaskProgressesTableTableManager Value userId = const Value.absent(), Value taskId = const Value.absent(), Value?> progress = const Value.absent(), - Value startedAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value startedAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserTaskProgressesCompanion( id: id, @@ -27408,8 +27858,8 @@ class $$UserTaskProgressesTableTableManager required String userId, required String taskId, Value?> progress = const Value.absent(), - Value startedAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value startedAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserTaskProgressesCompanion.insert( id: id, @@ -27495,8 +27945,8 @@ typedef $$UserTaskResultsTableCreateCompanionBuilder = required String userId, required String taskId, Value?> results, - Value completedAt, - Value createdAt, + Value completedAt, + Value createdAt, Value rowid, }); typedef $$UserTaskResultsTableUpdateCompanionBuilder = @@ -27505,8 +27955,8 @@ typedef $$UserTaskResultsTableUpdateCompanionBuilder = Value userId, Value taskId, Value?> results, - Value completedAt, - Value createdAt, + Value completedAt, + Value createdAt, Value rowid, }); @@ -27567,12 +28017,12 @@ class $$UserTaskResultsTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get completedAt => $composableBuilder( + ColumnFilters get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); @@ -27625,12 +28075,12 @@ class $$UserTaskResultsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get completedAt => $composableBuilder( + ColumnOrderings get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); @@ -27677,12 +28127,12 @@ class $$UserTaskResultsTableAnnotationComposer GeneratedColumnWithTypeConverter?, String> get results => $composableBuilder(column: $table.results, builder: (column) => column); - GeneratedColumn get completedAt => $composableBuilder( + GeneratedColumn get completedAt => $composableBuilder( column: $table.completedAt, builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -27743,8 +28193,8 @@ class $$UserTaskResultsTableTableManager Value userId = const Value.absent(), Value taskId = const Value.absent(), Value?> results = const Value.absent(), - Value completedAt = const Value.absent(), - Value createdAt = const Value.absent(), + Value completedAt = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserTaskResultsCompanion( id: id, @@ -27761,8 +28211,8 @@ class $$UserTaskResultsTableTableManager required String userId, required String taskId, Value?> results = const Value.absent(), - Value completedAt = const Value.absent(), - Value createdAt = const Value.absent(), + Value completedAt = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserTaskResultsCompanion.insert( id: id, @@ -27851,12 +28301,12 @@ typedef $$PromoCodesCampaignsTableCreateCompanionBuilder = required int activationsPerCode, required int activationsPerUser, required int generationSize, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, required String status, Value> tags, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -27869,12 +28319,12 @@ typedef $$PromoCodesCampaignsTableUpdateCompanionBuilder = Value activationsPerCode, Value activationsPerUser, Value generationSize, - Value start, - Value finish, + Value start, + Value finish, Value status, Value> tags, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -27959,12 +28409,12 @@ class $$PromoCodesCampaignsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get start => $composableBuilder( + ColumnFilters get start => $composableBuilder( column: $table.start, builder: (column) => ColumnFilters(column), ); - ColumnFilters get finish => $composableBuilder( + ColumnFilters get finish => $composableBuilder( column: $table.finish, builder: (column) => ColumnFilters(column), ); @@ -27980,12 +28430,12 @@ class $$PromoCodesCampaignsTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -28065,12 +28515,12 @@ class $$PromoCodesCampaignsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get start => $composableBuilder( + ColumnOrderings get start => $composableBuilder( column: $table.start, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get finish => $composableBuilder( + ColumnOrderings get finish => $composableBuilder( column: $table.finish, builder: (column) => ColumnOrderings(column), ); @@ -28085,12 +28535,12 @@ class $$PromoCodesCampaignsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -28137,10 +28587,10 @@ class $$PromoCodesCampaignsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get start => + GeneratedColumn get start => $composableBuilder(column: $table.start, builder: (column) => column); - GeneratedColumn get finish => + GeneratedColumn get finish => $composableBuilder(column: $table.finish, builder: (column) => column); GeneratedColumn get status => @@ -28149,10 +28599,10 @@ class $$PromoCodesCampaignsTableAnnotationComposer GeneratedColumnWithTypeConverter, String> get tags => $composableBuilder(column: $table.tags, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -28227,12 +28677,12 @@ class $$PromoCodesCampaignsTableTableManager Value activationsPerCode = const Value.absent(), Value activationsPerUser = const Value.absent(), Value generationSize = const Value.absent(), - Value start = const Value.absent(), - Value finish = const Value.absent(), + Value start = const Value.absent(), + Value finish = const Value.absent(), Value status = const Value.absent(), Value> tags = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => PromoCodesCampaignsCompanion( @@ -28261,12 +28711,12 @@ class $$PromoCodesCampaignsTableTableManager required int activationsPerCode, required int activationsPerUser, required int generationSize, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, required String status, Value> tags = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => PromoCodesCampaignsCompanion.insert( @@ -28349,8 +28799,8 @@ typedef $$PromoCodesTableCreateCompanionBuilder = required String code, Value activations, Value userId, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$PromoCodesTableUpdateCompanionBuilder = @@ -28360,8 +28810,8 @@ typedef $$PromoCodesTableUpdateCompanionBuilder = Value code, Value activations, Value userId, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -28434,12 +28884,12 @@ class $$PromoCodesTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -28515,12 +28965,12 @@ class $$PromoCodesTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -28593,10 +29043,10 @@ class $$PromoCodesTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$PromoCodesCampaignsTableAnnotationComposer get campaignId { @@ -28680,8 +29130,8 @@ class $$PromoCodesTableTableManager Value code = const Value.absent(), Value activations = const Value.absent(), Value userId = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => PromoCodesCompanion( id: id, @@ -28700,8 +29150,8 @@ class $$PromoCodesTableTableManager required String code, Value activations = const Value.absent(), Value userId = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => PromoCodesCompanion.insert( id: id, @@ -28797,12 +29247,12 @@ typedef $$DiscountCampaignsTableCreateCompanionBuilder = DiscountCampaignsCompanion Function({ Value id, Value name, - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, required String status, Value> tags, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -28810,12 +29260,12 @@ typedef $$DiscountCampaignsTableUpdateCompanionBuilder = DiscountCampaignsCompanion Function({ Value id, Value name, - Value start, - Value finish, + Value start, + Value finish, Value status, Value> tags, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -28874,12 +29324,12 @@ class $$DiscountCampaignsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get start => $composableBuilder( + ColumnFilters get start => $composableBuilder( column: $table.start, builder: (column) => ColumnFilters(column), ); - ColumnFilters get finish => $composableBuilder( + ColumnFilters get finish => $composableBuilder( column: $table.finish, builder: (column) => ColumnFilters(column), ); @@ -28895,12 +29345,12 @@ class $$DiscountCampaignsTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -28955,12 +29405,12 @@ class $$DiscountCampaignsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get start => $composableBuilder( + ColumnOrderings get start => $composableBuilder( column: $table.start, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get finish => $composableBuilder( + ColumnOrderings get finish => $composableBuilder( column: $table.finish, builder: (column) => ColumnOrderings(column), ); @@ -28975,12 +29425,12 @@ class $$DiscountCampaignsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -29006,10 +29456,10 @@ class $$DiscountCampaignsTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); - GeneratedColumn get start => + GeneratedColumn get start => $composableBuilder(column: $table.start, builder: (column) => column); - GeneratedColumn get finish => + GeneratedColumn get finish => $composableBuilder(column: $table.finish, builder: (column) => column); GeneratedColumn get status => @@ -29018,10 +29468,10 @@ class $$DiscountCampaignsTableAnnotationComposer GeneratedColumnWithTypeConverter, String> get tags => $composableBuilder(column: $table.tags, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -29088,12 +29538,12 @@ class $$DiscountCampaignsTableTableManager ({ Value id = const Value.absent(), Value name = const Value.absent(), - Value start = const Value.absent(), - Value finish = const Value.absent(), + Value start = const Value.absent(), + Value finish = const Value.absent(), Value status = const Value.absent(), Value> tags = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => DiscountCampaignsCompanion( @@ -29112,12 +29562,12 @@ class $$DiscountCampaignsTableTableManager ({ Value id = const Value.absent(), Value name = const Value.absent(), - required DateTime start, - required DateTime finish, + required PgDateTime start, + required PgDateTime finish, required String status, Value> tags = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => DiscountCampaignsCompanion.insert( @@ -29194,8 +29644,8 @@ typedef $$DiscountsTableCreateCompanionBuilder = required String campaignId, required double discountPercent, Value> products, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -29205,8 +29655,8 @@ typedef $$DiscountsTableUpdateCompanionBuilder = Value campaignId, Value discountPercent, Value> products, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value isDeleted, Value rowid, }); @@ -29284,12 +29734,12 @@ class $$DiscountsTableFilterComposer builder: (column) => ColumnWithTypeConverterFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -29372,12 +29822,12 @@ class $$DiscountsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -29431,10 +29881,10 @@ class $$DiscountsTableAnnotationComposer GeneratedColumnWithTypeConverter, String> get products => $composableBuilder(column: $table.products, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); GeneratedColumn get isDeleted => @@ -29523,8 +29973,8 @@ class $$DiscountsTableTableManager Value campaignId = const Value.absent(), Value discountPercent = const Value.absent(), Value> products = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => DiscountsCompanion( @@ -29543,8 +29993,8 @@ class $$DiscountsTableTableManager required String campaignId, required double discountPercent, Value> products = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value isDeleted = const Value.absent(), Value rowid = const Value.absent(), }) => DiscountsCompanion.insert( @@ -29653,14 +30103,14 @@ typedef $$DiscountUserDatasTableCreateCompanionBuilder = DiscountUserDatasCompanion Function({ required String discountId, required String userId, - Value grantedAt, + Value grantedAt, Value rowid, }); typedef $$DiscountUserDatasTableUpdateCompanionBuilder = DiscountUserDatasCompanion Function({ Value discountId, Value userId, - Value grantedAt, + Value grantedAt, Value rowid, }); @@ -29724,7 +30174,7 @@ class $$DiscountUserDatasTableFilterComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnFilters get grantedAt => $composableBuilder( + ColumnFilters get grantedAt => $composableBuilder( column: $table.grantedAt, builder: (column) => ColumnFilters(column), ); @@ -29785,7 +30235,7 @@ class $$DiscountUserDatasTableOrderingComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnOrderings get grantedAt => $composableBuilder( + ColumnOrderings get grantedAt => $composableBuilder( column: $table.grantedAt, builder: (column) => ColumnOrderings(column), ); @@ -29846,7 +30296,7 @@ class $$DiscountUserDatasTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get grantedAt => + GeneratedColumn get grantedAt => $composableBuilder(column: $table.grantedAt, builder: (column) => column); $$DiscountsTableAnnotationComposer get discountId { @@ -29931,7 +30381,7 @@ class $$DiscountUserDatasTableTableManager ({ Value discountId = const Value.absent(), Value userId = const Value.absent(), - Value grantedAt = const Value.absent(), + Value grantedAt = const Value.absent(), Value rowid = const Value.absent(), }) => DiscountUserDatasCompanion( discountId: discountId, @@ -29943,7 +30393,7 @@ class $$DiscountUserDatasTableTableManager ({ required String discountId, required String userId, - Value grantedAt = const Value.absent(), + Value grantedAt = const Value.absent(), Value rowid = const Value.absent(), }) => DiscountUserDatasCompanion.insert( discountId: discountId, @@ -30040,15 +30490,15 @@ typedef $$StudySessionsTableCreateCompanionBuilder = Value id, required String userId, Value sessionId, - required DateTime startTime, - Value endTime, + required PgDateTime startTime, + Value endTime, Value wordsLearned, Value testsCompleted, Value accuracy, Value packId, Value testId, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$StudySessionsTableUpdateCompanionBuilder = @@ -30056,15 +30506,15 @@ typedef $$StudySessionsTableUpdateCompanionBuilder = Value id, Value userId, Value sessionId, - Value startTime, - Value endTime, + Value startTime, + Value endTime, Value wordsLearned, Value testsCompleted, Value accuracy, Value packId, Value testId, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -30114,12 +30564,12 @@ class $$StudySessionsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get startTime => $composableBuilder( + ColumnFilters get startTime => $composableBuilder( column: $table.startTime, builder: (column) => ColumnFilters(column), ); - ColumnFilters get endTime => $composableBuilder( + ColumnFilters get endTime => $composableBuilder( column: $table.endTime, builder: (column) => ColumnFilters(column), ); @@ -30149,12 +30599,12 @@ class $$StudySessionsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -30202,12 +30652,12 @@ class $$StudySessionsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get startTime => $composableBuilder( + ColumnOrderings get startTime => $composableBuilder( column: $table.startTime, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get endTime => $composableBuilder( + ColumnOrderings get endTime => $composableBuilder( column: $table.endTime, builder: (column) => ColumnOrderings(column), ); @@ -30237,12 +30687,12 @@ class $$StudySessionsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -30286,10 +30736,10 @@ class $$StudySessionsTableAnnotationComposer GeneratedColumn get sessionId => $composableBuilder(column: $table.sessionId, builder: (column) => column); - GeneratedColumn get startTime => + GeneratedColumn get startTime => $composableBuilder(column: $table.startTime, builder: (column) => column); - GeneratedColumn get endTime => + GeneratedColumn get endTime => $composableBuilder(column: $table.endTime, builder: (column) => column); GeneratedColumn get wordsLearned => $composableBuilder( @@ -30311,10 +30761,10 @@ class $$StudySessionsTableAnnotationComposer GeneratedColumn get testId => $composableBuilder(column: $table.testId, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -30372,15 +30822,15 @@ class $$StudySessionsTableTableManager Value id = const Value.absent(), Value userId = const Value.absent(), Value sessionId = const Value.absent(), - Value startTime = const Value.absent(), - Value endTime = const Value.absent(), + Value startTime = const Value.absent(), + Value endTime = const Value.absent(), Value wordsLearned = const Value.absent(), Value testsCompleted = const Value.absent(), Value accuracy = const Value.absent(), Value packId = const Value.absent(), Value testId = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => StudySessionsCompanion( id: id, @@ -30402,15 +30852,15 @@ class $$StudySessionsTableTableManager Value id = const Value.absent(), required String userId, Value sessionId = const Value.absent(), - required DateTime startTime, - Value endTime = const Value.absent(), + required PgDateTime startTime, + Value endTime = const Value.absent(), Value wordsLearned = const Value.absent(), Value testsCompleted = const Value.absent(), Value accuracy = const Value.absent(), Value packId = const Value.absent(), Value testId = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => StudySessionsCompanion.insert( id: id, @@ -30499,10 +30949,10 @@ typedef $$UserAchievementsTableCreateCompanionBuilder = Value id, required String userId, required String achievementId, - Value unlockedAt, + Value unlockedAt, Value progress, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$UserAchievementsTableUpdateCompanionBuilder = @@ -30510,10 +30960,10 @@ typedef $$UserAchievementsTableUpdateCompanionBuilder = Value id, Value userId, Value achievementId, - Value unlockedAt, + Value unlockedAt, Value progress, - Value createdAt, - Value updatedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -30564,7 +31014,7 @@ class $$UserAchievementsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get unlockedAt => $composableBuilder( + ColumnFilters get unlockedAt => $composableBuilder( column: $table.unlockedAt, builder: (column) => ColumnFilters(column), ); @@ -30574,12 +31024,12 @@ class $$UserAchievementsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -30627,7 +31077,7 @@ class $$UserAchievementsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get unlockedAt => $composableBuilder( + ColumnOrderings get unlockedAt => $composableBuilder( column: $table.unlockedAt, builder: (column) => ColumnOrderings(column), ); @@ -30637,12 +31087,12 @@ class $$UserAchievementsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -30688,7 +31138,7 @@ class $$UserAchievementsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get unlockedAt => $composableBuilder( + GeneratedColumn get unlockedAt => $composableBuilder( column: $table.unlockedAt, builder: (column) => column, ); @@ -30696,10 +31146,10 @@ class $$UserAchievementsTableAnnotationComposer GeneratedColumn get progress => $composableBuilder(column: $table.progress, builder: (column) => column); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); $$UsersTableAnnotationComposer get userId { @@ -30759,10 +31209,10 @@ class $$UserAchievementsTableTableManager Value id = const Value.absent(), Value userId = const Value.absent(), Value achievementId = const Value.absent(), - Value unlockedAt = const Value.absent(), + Value unlockedAt = const Value.absent(), Value progress = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserAchievementsCompanion( id: id, @@ -30779,10 +31229,10 @@ class $$UserAchievementsTableTableManager Value id = const Value.absent(), required String userId, required String achievementId, - Value unlockedAt = const Value.absent(), + Value unlockedAt = const Value.absent(), Value progress = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => UserAchievementsCompanion.insert( id: id, @@ -30869,9 +31319,9 @@ typedef $$ShareRequestsTableCreateCompanionBuilder = required String telegramUserId, Value telegramUsername, Value sharedCardId, - Value requestedAt, - Value createdAt, - Value updatedAt, + Value requestedAt, + Value createdAt, + Value updatedAt, Value rowid, }); typedef $$ShareRequestsTableUpdateCompanionBuilder = @@ -30880,9 +31330,9 @@ typedef $$ShareRequestsTableUpdateCompanionBuilder = Value telegramUserId, Value telegramUsername, Value sharedCardId, - Value requestedAt, - Value createdAt, - Value updatedAt, + Value requestedAt, + Value createdAt, + Value updatedAt, Value rowid, }); @@ -30915,17 +31365,17 @@ class $$ShareRequestsTableFilterComposer builder: (column) => ColumnFilters(column), ); - ColumnFilters get requestedAt => $composableBuilder( + ColumnFilters get requestedAt => $composableBuilder( column: $table.requestedAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get createdAt => $composableBuilder( + ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column), ); - ColumnFilters get updatedAt => $composableBuilder( + ColumnFilters get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnFilters(column), ); @@ -30960,17 +31410,17 @@ class $$ShareRequestsTableOrderingComposer builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get requestedAt => $composableBuilder( + ColumnOrderings get requestedAt => $composableBuilder( column: $table.requestedAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get createdAt => $composableBuilder( + ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column), ); - ColumnOrderings get updatedAt => $composableBuilder( + ColumnOrderings get updatedAt => $composableBuilder( column: $table.updatedAt, builder: (column) => ColumnOrderings(column), ); @@ -31003,15 +31453,15 @@ class $$ShareRequestsTableAnnotationComposer builder: (column) => column, ); - GeneratedColumn get requestedAt => $composableBuilder( + GeneratedColumn get requestedAt => $composableBuilder( column: $table.requestedAt, builder: (column) => column, ); - GeneratedColumn get createdAt => + GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); - GeneratedColumn get updatedAt => + GeneratedColumn get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column); } @@ -31050,9 +31500,9 @@ class $$ShareRequestsTableTableManager Value telegramUserId = const Value.absent(), Value telegramUsername = const Value.absent(), Value sharedCardId = const Value.absent(), - Value requestedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value requestedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => ShareRequestsCompanion( id: id, @@ -31070,9 +31520,9 @@ class $$ShareRequestsTableTableManager required String telegramUserId, Value telegramUsername = const Value.absent(), Value sharedCardId = const Value.absent(), - Value requestedAt = const Value.absent(), - Value createdAt = const Value.absent(), - Value updatedAt = const Value.absent(), + Value requestedAt = const Value.absent(), + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value rowid = const Value.absent(), }) => ShareRequestsCompanion.insert( id: id, diff --git a/mnemo_cards_backend/lib/database/postgres_constants.dart b/mnemo_cards_backend/lib/database/postgres_constants.dart deleted file mode 100644 index a1d5fe2..0000000 --- a/mnemo_cards_backend/lib/database/postgres_constants.dart +++ /dev/null @@ -1,6 +0,0 @@ -import 'package:drift/drift.dart'; - -/// PostgreSQL-совместимое выражение для текущей даты и времени как Unix timestamp (bigint) -/// Используется вместо currentDateAndTime, который использует SQLite-специфичную функцию strftime -/// Drift хранит DateTime как bigint (Unix timestamp в секундах), поэтому используем EXTRACT(EPOCH FROM NOW())::BIGINT -const Expression currentTimestamp = CustomExpression('EXTRACT(EPOCH FROM NOW())::BIGINT'); diff --git a/mnemo_cards_backend/lib/database/tables/achievements.dart b/mnemo_cards_backend/lib/database/tables/achievements.dart index bf3a673..a8a19d0 100644 --- a/mnemo_cards_backend/lib/database/tables/achievements.dart +++ b/mnemo_cards_backend/lib/database/tables/achievements.dart @@ -1,25 +1,31 @@ import 'package:drift/drift.dart'; -import '../postgres_constants.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'users.dart'; /// Таблица UserAchievements - достижения пользователей class UserAchievements extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); // Achievement ID (from AchievementDefinitions) TextColumn get achievementId => text()(); // When achievement was unlocked - DateTimeColumn get unlockedAt => dateTime().withDefault(currentTimestamp)(); + Column get unlockedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); // Progress (0.0 to 1.0) RealColumn get progress => real().withDefault(const Constant(1.0))(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/auth.dart b/mnemo_cards_backend/lib/database/tables/auth.dart index 4acd796..d045991 100644 --- a/mnemo_cards_backend/lib/database/tables/auth.dart +++ b/mnemo_cards_backend/lib/database/tables/auth.dart @@ -1,18 +1,22 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'users.dart'; import '../converters.dart' show generateUuid; -import '../postgres_constants.dart'; /// Таблица Tokens - токены авторизации пользователей class Tokens extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); TextColumn get token => text().unique()(); TextColumn get externalUserId => text()(); - DateTimeColumn get created => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get expires => dateTime()(); + Column get created => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get expires => customType(PgTypes.timestampWithTimezone)(); @override Set get primaryKey => {id}; @@ -25,17 +29,21 @@ class Tokens extends Table { /// Таблица RefreshTokens - refresh токены для JWT class RefreshTokens extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); TextColumn get jti => text().unique()(); // JWT ID BoolColumn get isBlacklisted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get expiresAt => dateTime()(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get expiresAt => customType(PgTypes.timestampWithTimezone)(); @override Set get primaryKey => {id}; @@ -43,7 +51,9 @@ class RefreshTokens extends Table { /// Таблица TelegramAuthCodes - коды для авторизации через Telegram class TelegramAuthCodes extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get code => text().unique()(); TextColumn get telegramUserId => text()(); @@ -53,11 +63,13 @@ class TelegramAuthCodes extends Table { BoolColumn get isUsed => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK - DateTimeColumn get usedAt => dateTime().nullable()(); + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN + Column get usedAt => customType(PgTypes.timestampWithTimezone) + .nullable()(); - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get expiresAt => dateTime()(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get expiresAt => customType(PgTypes.timestampWithTimezone)(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/discounts.dart b/mnemo_cards_backend/lib/database/tables/discounts.dart index 393419c..5f1c2f2 100644 --- a/mnemo_cards_backend/lib/database/tables/discounts.dart +++ b/mnemo_cards_backend/lib/database/tables/discounts.dart @@ -1,16 +1,18 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show generateUuid, StringListConverter, JsonListConverter; -import '../postgres_constants.dart'; import 'users.dart'; /// Таблица DiscountCampaigns - кампании скидок class DiscountCampaigns extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get name => text().nullable()(); - DateTimeColumn get start => dateTime()(); - DateTimeColumn get finish => dateTime()(); + Column get start => customType(PgTypes.timestampWithTimezone)(); + Column get finish => customType(PgTypes.timestampWithTimezone)(); // Статус (enum as string) TextColumn get status => text()(); // created, active, expired, disabled @@ -21,11 +23,13 @@ class DiscountCampaigns extends Table { .map(const StringListConverter())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -33,8 +37,11 @@ class DiscountCampaigns extends Table { /// Таблица Discounts - скидки class Discounts extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get campaignId => text().references(DiscountCampaigns, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get campaignId => text() + .references(DiscountCampaigns, #id, onDelete: KeyAction.cascade)(); // Процент скидки (0-100) RealColumn get discountPercent => real()(); @@ -45,11 +52,13 @@ class Discounts extends Table { .map(const JsonListConverter())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -57,10 +66,13 @@ class Discounts extends Table { /// Junction table для связи Discounts ↔ UserDatas (many-to-many) class DiscountUserDatas extends Table { - TextColumn get discountId => text().references(Discounts, #id, onDelete: KeyAction.cascade)(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + TextColumn get discountId => text() + .references(Discounts, #id, onDelete: KeyAction.cascade)(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); - DateTimeColumn get grantedAt => dateTime().withDefault(currentTimestamp)(); + Column get grantedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {discountId, userId}; diff --git a/mnemo_cards_backend/lib/database/tables/packs.dart b/mnemo_cards_backend/lib/database/tables/packs.dart index 6a9690b..84948f2 100644 --- a/mnemo_cards_backend/lib/database/tables/packs.dart +++ b/mnemo_cards_backend/lib/database/tables/packs.dart @@ -1,10 +1,12 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show generateUuid, IntListConverter, StringListConverter; -import '../postgres_constants.dart'; /// Таблица CardPacks - наборы карточек class CardPacks extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); // Основная информация TextColumn get title => text()(); @@ -21,7 +23,7 @@ class CardPacks extends Table { IntColumn get order => integer().withDefault(const Constant(0))(); BoolColumn get enabled => boolean() .withDefault(const Constant(true)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN // Порядок карточек (JSON array of IDs) TextColumn get cardsOrder => text() @@ -38,11 +40,13 @@ class CardPacks extends Table { TextColumn get currency => text().withDefault(const Constant('RUB'))(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -50,8 +54,11 @@ class CardPacks extends Table { /// Таблица GameCards - карточки для изучения class GameCards extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get packId => text().references(CardPacks, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get packId => text() + .references(CardPacks, #id, onDelete: KeyAction.cascade)(); // Основной контент TextColumn get original => text()(); // слово на иностранном языке @@ -70,11 +77,13 @@ class GameCards extends Table { TextColumn get back => text().nullable()(); // дополнительный текст // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -82,13 +91,17 @@ class GameCards extends Table { /// Таблица VoiceModels - голосовые файлы для карточек class VoiceModels extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get cardId => text().references(GameCards, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get cardId => text() + .references(GameCards, #id, onDelete: KeyAction.cascade)(); TextColumn get voiceUrl => text()(); // URL аудиофайла TextColumn get language => text()(); // язык озвучки - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/payments.dart b/mnemo_cards_backend/lib/database/tables/payments.dart index ef3ee02..af0a8a3 100644 --- a/mnemo_cards_backend/lib/database/tables/payments.dart +++ b/mnemo_cards_backend/lib/database/tables/payments.dart @@ -1,12 +1,15 @@ import 'package:drift/drift.dart'; -import '../converters.dart' show generateUuid, JsonListConverter, StringListConverter; -import '../postgres_constants.dart'; +import 'package:drift_postgres/drift_postgres.dart'; +import '../converters.dart' show JsonListConverter, StringListConverter; import 'users.dart'; /// Таблица Payments - платежи class Payments extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); TextColumn get amount => text()(); TextColumn get currency => text()(); @@ -18,7 +21,8 @@ class Payments extends Table { TextColumn get externalToken => text().nullable()(); TextColumn get meta => text().nullable()(); - DateTimeColumn get date => dateTime().withDefault(currentTimestamp)(); + Column get date => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); // Продукты (JSON array) TextColumn get products => text() @@ -31,11 +35,13 @@ class Payments extends Table { .map(const StringListConverter())(); BoolColumn get subscription => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/promo_codes.dart b/mnemo_cards_backend/lib/database/tables/promo_codes.dart index 8da50da..c662e7b 100644 --- a/mnemo_cards_backend/lib/database/tables/promo_codes.dart +++ b/mnemo_cards_backend/lib/database/tables/promo_codes.dart @@ -1,11 +1,13 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show generateUuid, JsonListConverter, StringListConverter; -import '../postgres_constants.dart'; import 'users.dart'; /// Таблица PromoCodesCampaigns - кампании промокодов class PromoCodesCampaigns extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get template => text()(); TextColumn get name => text().nullable()(); @@ -19,8 +21,8 @@ class PromoCodesCampaigns extends Table { IntColumn get activationsPerUser => integer()(); IntColumn get generationSize => integer()(); - DateTimeColumn get start => dateTime()(); - DateTimeColumn get finish => dateTime()(); + Column get start => customType(PgTypes.timestampWithTimezone)(); + Column get finish => customType(PgTypes.timestampWithTimezone)(); // Статус (enum as string) TextColumn get status => text()(); // created, preparing, ready, active, disabled @@ -31,11 +33,13 @@ class PromoCodesCampaigns extends Table { .map(const StringListConverter())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -43,18 +47,25 @@ class PromoCodesCampaigns extends Table { /// Таблица PromoCodes - промокоды class PromoCodes extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get campaignId => text().references(PromoCodesCampaigns, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get campaignId => text() + .references(PromoCodesCampaigns, #id, onDelete: KeyAction.cascade)(); TextColumn get code => text().unique()(); IntColumn get activations => integer().withDefault(const Constant(0))(); // Индивидуальный промокод (связан с пользователем) - TextColumn get userId => text().nullable().references(Users, #id, onDelete: KeyAction.cascade)(); + TextColumn get userId => text() + .nullable() + .references(Users, #id, onDelete: KeyAction.cascade)(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/relations.dart b/mnemo_cards_backend/lib/database/tables/relations.dart index fb43291..3506e51 100644 --- a/mnemo_cards_backend/lib/database/tables/relations.dart +++ b/mnemo_cards_backend/lib/database/tables/relations.dart @@ -1,16 +1,19 @@ import 'package:drift/drift.dart'; -import '../postgres_constants.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'users.dart'; import 'packs.dart' show CardPacks, GameCards, VoiceModels; /// Junction table для связи Users ↔ CardPacks (многие ко многим) /// Хранит информацию о том, какие паки куплены пользователем class UserPacks extends Table { - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); - TextColumn get packId => text().references(CardPacks, #id, onDelete: KeyAction.cascade)(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); + TextColumn get packId => text() + .references(CardPacks, #id, onDelete: KeyAction.cascade)(); // Когда пользователь получил доступ к паку - DateTimeColumn get grantedAt => dateTime().withDefault(currentTimestamp)(); + Column get grantedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); // Как пользователь получил пак (purchase, promo, free, admin) TextColumn get grantType => text().withDefault(const Constant('purchase'))(); @@ -22,8 +25,10 @@ class UserPacks extends Table { /// Таблица PreviewCards - связь CardPacks с preview карточками /// Хранит какие карточки показывать в превью пака class PreviewCards extends Table { - TextColumn get packId => text().references(CardPacks, #id, onDelete: KeyAction.cascade)(); - TextColumn get cardId => text().references(GameCards, #id, onDelete: KeyAction.cascade)(); + TextColumn get packId => text() + .references(CardPacks, #id, onDelete: KeyAction.cascade)(); + TextColumn get cardId => text() + .references(GameCards, #id, onDelete: KeyAction.cascade)(); IntColumn get order => integer().withDefault(const Constant(0))(); @@ -34,8 +39,10 @@ class PreviewCards extends Table { /// Таблица CardPackCards - связь CardPacks с GameCards (many-to-many) /// Хранит какие карточки принадлежат какому паку class CardPackCards extends Table { - TextColumn get packId => text().references(CardPacks, #id, onDelete: KeyAction.cascade)(); - TextColumn get cardId => text().references(GameCards, #id, onDelete: KeyAction.cascade)(); + TextColumn get packId => text() + .references(CardPacks, #id, onDelete: KeyAction.cascade)(); + TextColumn get cardId => text() + .references(GameCards, #id, onDelete: KeyAction.cascade)(); IntColumn get order => integer().withDefault(const Constant(0))(); @@ -46,8 +53,10 @@ class CardPackCards extends Table { /// Таблица CardVoices - связь GameCards с VoiceModels (many-to-many) /// Хранит какие голосовые файлы принадлежат какой карточке class CardVoices extends Table { - TextColumn get cardId => text().references(GameCards, #id, onDelete: KeyAction.cascade)(); - TextColumn get voiceId => text().references(VoiceModels, #id, onDelete: KeyAction.cascade)(); + TextColumn get cardId => text() + .references(GameCards, #id, onDelete: KeyAction.cascade)(); + TextColumn get voiceId => text() + .references(VoiceModels, #id, onDelete: KeyAction.cascade)(); @override Set get primaryKey => {cardId, voiceId}; diff --git a/mnemo_cards_backend/lib/database/tables/statistics.dart b/mnemo_cards_backend/lib/database/tables/statistics.dart index 5420a3c..b18a381 100644 --- a/mnemo_cards_backend/lib/database/tables/statistics.dart +++ b/mnemo_cards_backend/lib/database/tables/statistics.dart @@ -1,17 +1,21 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'users.dart'; import '../converters.dart' show generateUuid; -import '../postgres_constants.dart'; /// Таблица StudySessions - сессии изучения class StudySessions extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); TextColumn get sessionId => text().nullable().unique()(); - DateTimeColumn get startTime => dateTime()(); - DateTimeColumn get endTime => dateTime().nullable()(); + Column get startTime => customType(PgTypes.timestampWithTimezone)(); + Column get endTime => customType(PgTypes.timestampWithTimezone) + .nullable()(); IntColumn get wordsLearned => integer().withDefault(const Constant(0))(); IntColumn get testsCompleted => integer().withDefault(const Constant(0))(); @@ -21,8 +25,10 @@ class StudySessions extends Table { TextColumn get testId => text().nullable()(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/subscriptions.dart b/mnemo_cards_backend/lib/database/tables/subscriptions.dart index 827266b..7345a7b 100644 --- a/mnemo_cards_backend/lib/database/tables/subscriptions.dart +++ b/mnemo_cards_backend/lib/database/tables/subscriptions.dart @@ -1,12 +1,13 @@ import 'package:drift/drift.dart'; - +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show JsonMapConverter, JsonListConverter; -import '../postgres_constants.dart'; import 'users.dart'; /// Таблица SubscriptionPlans - планы подписки class SubscriptionPlans extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); // UI информация (JSON) TextColumn get ui => text().nullable().map(const JsonMapConverter())(); @@ -26,11 +27,13 @@ class SubscriptionPlans extends Table { TextColumn get paymentSystem => text()(); // enum as string // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -38,11 +41,15 @@ class SubscriptionPlans extends Table { /// Таблица UserSubscriptions - подписки пользователей class UserSubscriptions extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().unique().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .unique() + .references(Users, #id, onDelete: KeyAction.cascade)(); - DateTimeColumn get start => dateTime()(); - DateTimeColumn get finish => dateTime()(); + Column get start => customType(PgTypes.timestampWithTimezone)(); + Column get finish => customType(PgTypes.timestampWithTimezone)(); // Функции подписки (JSON array) TextColumn get features => text() @@ -50,8 +57,10 @@ class UserSubscriptions extends Table { .map(const JsonListConverter())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/tasks.dart b/mnemo_cards_backend/lib/database/tables/tasks.dart index 28642b5..c43951e 100644 --- a/mnemo_cards_backend/lib/database/tables/tasks.dart +++ b/mnemo_cards_backend/lib/database/tables/tasks.dart @@ -1,11 +1,13 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show generateUuid, JsonListConverter, JsonMapConverter, StringListConverter; -import '../postgres_constants.dart'; import 'users.dart'; /// Таблица Tasks - задачи системы class Tasks extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get name => text()(); IntColumn get minCycleMillis => integer()(); @@ -15,11 +17,14 @@ class Tasks extends Table { TextColumn get status => text().nullable()(); TextColumn get description => text().nullable()(); - DateTimeColumn get lastExecution => dateTime().nullable()(); + Column get lastExecution => customType(PgTypes.timestampWithTimezone) + .nullable()(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; @@ -27,7 +32,9 @@ class Tasks extends Table { /// Таблица UserTasks - задачи пользователей class UserTasks extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get title => text()(); TextColumn get description => text()(); @@ -40,9 +47,11 @@ class UserTasks extends Table { .withDefault(const Constant('[]')) .map(const JsonListConverter())(); - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get expiresAt => dateTime()(); - DateTimeColumn get completedAt => dateTime().nullable()(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get expiresAt => customType(PgTypes.timestampWithTimezone)(); + Column get completedAt => customType(PgTypes.timestampWithTimezone) + .nullable()(); TextColumn get proofUrl => text().nullable()(); TextColumn get instructions => text().nullable()(); @@ -55,7 +64,8 @@ class UserTasks extends Table { TextColumn get imageUrl => text().nullable()(); // Audit - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; @@ -63,8 +73,11 @@ class UserTasks extends Table { /// Таблица UserTaskProgresses - прогресс выполнения задач пользователями class UserTaskProgresses extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); TextColumn get taskId => text()(); // Reference to UserTasks, but not FK to avoid circular deps // Прогресс (JSON) @@ -72,8 +85,10 @@ class UserTaskProgresses extends Table { .withDefault(const Constant('{}')) .map(const JsonMapConverter())(); - DateTimeColumn get startedAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get startedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; @@ -81,8 +96,11 @@ class UserTaskProgresses extends Table { /// Таблица UserTaskResults - результаты выполнения задач class UserTaskResults extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .references(Users, #id, onDelete: KeyAction.cascade)(); TextColumn get taskId => text()(); // Reference to UserTasks // Результаты (JSON) @@ -90,10 +108,12 @@ class UserTaskResults extends Table { .withDefault(const Constant('{}')) .map(const JsonMapConverter())(); - DateTimeColumn get completedAt => dateTime().withDefault(currentTimestamp)(); + Column get completedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/telegram.dart b/mnemo_cards_backend/lib/database/tables/telegram.dart index fdcd58f..06f6e20 100644 --- a/mnemo_cards_backend/lib/database/tables/telegram.dart +++ b/mnemo_cards_backend/lib/database/tables/telegram.dart @@ -1,21 +1,27 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show generateUuid; -import '../postgres_constants.dart'; /// Таблица ShareRequests - запросы на шаринг через Telegram class ShareRequests extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get telegramUserId => text()(); TextColumn get telegramUsername => text().nullable()(); - TextColumn get sharedCardId => text().nullable()(); + TextColumn get sharedCardId => text() + .nullable()(); - DateTimeColumn get requestedAt => dateTime().withDefault(currentTimestamp)(); + Column get requestedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/tests.dart b/mnemo_cards_backend/lib/database/tables/tests.dart index 20483ba..26c6e3a 100644 --- a/mnemo_cards_backend/lib/database/tables/tests.dart +++ b/mnemo_cards_backend/lib/database/tables/tests.dart @@ -1,11 +1,13 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart' show generateUuid, JsonMapConverter; -import '../postgres_constants.dart'; import 'packs.dart'; /// Таблица Tests - тесты class Tests extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get name => text()(); TextColumn get color => text().nullable()(); @@ -15,11 +17,13 @@ class Tests extends Table { TextColumn get timeSubtitle => text().nullable()(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -27,16 +31,21 @@ class Tests extends Table { /// Таблица TestQuestions - вопросы тестов class TestQuestions extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get testId => text().references(Tests, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get testId => text() + .references(Tests, #id, onDelete: KeyAction.cascade)(); // Тип вопроса (enum as string) TextColumn get questionType => text()(); TextColumn get body => text()(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; @@ -44,8 +53,10 @@ class TestQuestions extends Table { /// Таблица TestPackRelations - связь Tests с CardPacks (many-to-many) class TestPackRelations extends Table { - TextColumn get testId => text().references(Tests, #id, onDelete: KeyAction.cascade)(); - TextColumn get packId => text().references(CardPacks, #id, onDelete: KeyAction.cascade)(); + TextColumn get testId => text() + .references(Tests, #id, onDelete: KeyAction.cascade)(); + TextColumn get packId => text() + .references(CardPacks, #id, onDelete: KeyAction.cascade)(); @override Set get primaryKey => {testId, packId}; @@ -53,20 +64,26 @@ class TestPackRelations extends Table { /// Таблица TestStatistics - статистика прохождения тестов class TestStatistics extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get userId => text()(); // Reference to Users, but not FK to avoid circular deps - TextColumn get testId => text().references(Tests, #id, onDelete: KeyAction.cascade)(); + TextColumn get testId => text() + .references(Tests, #id, onDelete: KeyAction.cascade)(); // Результаты (JSON) TextColumn get results => text() .withDefault(const Constant('{}')) .map(const JsonMapConverter())(); - DateTimeColumn get completedAt => dateTime().withDefault(currentTimestamp)(); + Column get completedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/database/tables/users.dart b/mnemo_cards_backend/lib/database/tables/users.dart index 2d32fe9..d8d7b06 100644 --- a/mnemo_cards_backend/lib/database/tables/users.dart +++ b/mnemo_cards_backend/lib/database/tables/users.dart @@ -1,16 +1,18 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import '../converters.dart'; -import '../postgres_constants.dart'; /// Таблица Users - основная информация о пользователях class Users extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); TextColumn get externalUserId => text().unique()(); TextColumn get name => text().nullable()(); TextColumn get email => text().nullable()(); BoolColumn get admin => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN // UserSettings (JSON) TextColumn get userSettings => text().nullable()(); @@ -21,11 +23,13 @@ class Users extends Table { .map(const StringListConverter())(); // Audit fields - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); BoolColumn get isDeleted => boolean() .withDefault(const Constant(false)) - .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN, не нужен CHECK + .customConstraint('')(); // PostgreSQL использует нативный BOOLEAN @override Set get primaryKey => {id}; @@ -38,8 +42,12 @@ class Users extends Table { /// Таблица UserDatas - расширенная информация о пользователе class UserDatas extends Table { - TextColumn get id => text().withDefault(const Constant('gen_random_uuid()'))(); - TextColumn get userId => text().unique().references(Users, #id, onDelete: KeyAction.cascade)(); + // ID как String, но фактически UUID (генерируется PostgreSQL на стороне БД) + TextColumn get id => text() + .withDefault(const CustomExpression('gen_random_uuid()::text'))(); + TextColumn get userId => text() + .unique() + .references(Users, #id, onDelete: KeyAction.cascade)(); // Статистика IntColumn get totalStudyTimeMinutes => integer().withDefault(const Constant(0))(); @@ -49,8 +57,10 @@ class UserDatas extends Table { IntColumn get totalTests => integer().withDefault(const Constant(0))(); // Временные метки - DateTimeColumn get lastTimeOnline => dateTime().nullable()(); - DateTimeColumn get registrationDate => dateTime().withDefault(currentTimestamp)(); + Column get lastTimeOnline => customType(PgTypes.timestampWithTimezone) + .nullable()(); + Column get registrationDate => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); TextColumn get lastTestSessionToken => text().nullable()(); // Сложные структуры (JSON) @@ -79,8 +89,10 @@ class UserDatas extends Table { .map(const JsonMapConverter())(); // Audit - DateTimeColumn get createdAt => dateTime().withDefault(currentTimestamp)(); - DateTimeColumn get updatedAt => dateTime().withDefault(currentTimestamp)(); + Column get createdAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); + Column get updatedAt => customType(PgTypes.timestampWithTimezone) + .withDefault(now())(); @override Set get primaryKey => {id}; diff --git a/mnemo_cards_backend/lib/discounts/discount_drift_extension.dart b/mnemo_cards_backend/lib/discounts/discount_drift_extension.dart index 8790d16..1ea4bce 100644 --- a/mnemo_cards_backend/lib/discounts/discount_drift_extension.dart +++ b/mnemo_cards_backend/lib/discounts/discount_drift_extension.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart' as drift; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:mnemo_cards_backend/database/daos/discount_dao.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:mnemo_cards_common/mnemo_cards_common.dart'; @@ -30,8 +31,8 @@ extension DiscountCampaignToDto on DiscountCampaign { return DiscountCampaignDto( id: id, - start: start, - finish: finish, + start: start.dateTime, + finish: finish.dateTime, status: statusEnum, name: name, tags: tags, @@ -80,8 +81,8 @@ extension DiscountCampaignDtoToCompanion on DiscountCampaignDto { return DiscountCampaignsCompanion.insert( id: id != null ? drift.Value(id!) : const drift.Value.absent(), name: drift.Value(name), - start: start, - finish: finish, + start: PgDateTime(start), + finish: PgDateTime(finish), status: statusStr, tags: drift.Value(tags), ); diff --git a/mnemo_cards_backend/lib/discounts/discounts_manager.dart b/mnemo_cards_backend/lib/discounts/discounts_manager.dart index b1d65d9..a8f240a 100644 --- a/mnemo_cards_backend/lib/discounts/discounts_manager.dart +++ b/mnemo_cards_backend/lib/discounts/discounts_manager.dart @@ -42,12 +42,12 @@ class DiscountsManager { String? targetStatus; if (campaign.status == 'created' && - now.isBetween(campaign.start, campaign.finish)) { + now.isBetween(campaign.start.dateTime, campaign.finish.dateTime)) { targetStatus = 'active'; } else if (campaign.status == 'active') { - if (now.isBefore(campaign.start)) { + if (now.isBefore(campaign.start.dateTime)) { targetStatus = 'created'; - } else if (now.isAfter(campaign.finish)) { + } else if (now.isAfter(campaign.finish.dateTime)) { targetStatus = 'expired'; } } @@ -59,8 +59,8 @@ class DiscountsManager { Future applyCampaign(DiscountCampaign campaign) async { final now = DateTime.now(); - if (!now.isBetween(campaign.start, campaign.finish)) { - if (now.isBefore(campaign.start)) { + if (!now.isBetween(campaign.start.dateTime, campaign.finish.dateTime)) { + if (now.isBefore(campaign.start.dateTime)) { return DiscountError(DiscountErrorType.notStarted); } return DiscountError(DiscountErrorType.expired); diff --git a/mnemo_cards_backend/lib/promo_codes/promo_codes_manager.dart b/mnemo_cards_backend/lib/promo_codes/promo_codes_manager.dart index 2009024..8219cf1 100644 --- a/mnemo_cards_backend/lib/promo_codes/promo_codes_manager.dart +++ b/mnemo_cards_backend/lib/promo_codes/promo_codes_manager.dart @@ -1,3 +1,4 @@ +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/api/purchase/payment_manager.dart'; import 'package:mnemo_cards_backend/database/database.dart'; @@ -47,8 +48,8 @@ class PromoCodesManager { activationsPerCode: campaign.activationsPerCode, activationsPerUser: campaign.activationsPerUser, generationSize: campaign.generationSize, - start: campaign.start, - finish: campaign.finish, + start: campaign.start.dateTime, + finish: campaign.finish.dateTime, status: _parseCampaignStatus(campaign.status), tags: campaign.tags, promoCodes: promoCodes, @@ -77,8 +78,8 @@ class PromoCodesManager { activationsPerCode: campaign.activationsPerCode, activationsPerUser: campaign.activationsPerUser, generationSize: campaign.generationSize, - start: campaign.start, - finish: campaign.finish, + start: campaign.start.dateTime, + finish: campaign.finish.dateTime, status: _parseCampaignStatus(campaign.status), tags: campaign.tags, promoCodes: promoCodes, @@ -95,8 +96,8 @@ class PromoCodesManager { activationsPerCode: dto.activationsPerCode, activationsPerUser: dto.activationsPerUser, generationSize: dto.generationSize, - start: dto.start, - finish: dto.finish, + start: PgDateTime(dto.start), + finish: PgDateTime(dto.finish), status: dto.status.name, tags: drift.Value(dto.tags), ); @@ -119,11 +120,11 @@ class PromoCodesManager { activationsPerCode: dto.activationsPerCode, activationsPerUser: dto.activationsPerUser, generationSize: dto.generationSize, - start: dto.start, - finish: dto.finish, + start: PgDateTime(dto.start), + finish: PgDateTime(dto.finish), status: dto.status.name, tags: dto.tags, - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), ); await _db.promoCodeDao.updateCampaign(updated); @@ -137,7 +138,7 @@ class PromoCodesManager { // Soft delete - mark as deleted await _db.promoCodeDao.updateCampaign(existing.copyWith( isDeleted: true, - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), )); return null; // No error @@ -168,8 +169,8 @@ class PromoCodesManager { final now = DateTime.now(); if (campaign.status != 'active' || - campaign.start.isAfter(now) || - campaign.finish.isBefore(now)) { + campaign.start.dateTime.isAfter(now) || + campaign.finish.dateTime.isBefore(now)) { return {'valid': false, 'message': 'Promo code expired'}; } @@ -254,7 +255,7 @@ class PromoCodesManager { await _db.promoCodeDao.updateCampaign( campaign.copyWith( status: 'active', - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), ), ); }); diff --git a/mnemo_cards_backend/lib/statistics/achievement_manager.dart b/mnemo_cards_backend/lib/statistics/achievement_manager.dart index 1d91d06..ca393f6 100644 --- a/mnemo_cards_backend/lib/statistics/achievement_manager.dart +++ b/mnemo_cards_backend/lib/statistics/achievement_manager.dart @@ -1,4 +1,5 @@ import 'package:drift/drift.dart'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:mnemo_cards_common/mnemo_cards_common.dart'; @@ -57,7 +58,7 @@ class AchievementManager { final definition = AchievementDefinitions.getById(userAchievement.achievementId); if (definition != null) { achievements.add(definition.copyWith( - unlockedAt: userAchievement.unlockedAt, + unlockedAt: userAchievement.unlockedAt.dateTime, progress: userAchievement.progress, )); } @@ -90,7 +91,7 @@ class AchievementManager { final companion = UserAchievementsCompanion.insert( userId: userId, achievementId: achievementId, - unlockedAt: Value(DateTime.now()), + unlockedAt: Value(PgDateTime(DateTime.now())), progress: Value(1.0), ); diff --git a/mnemo_cards_backend/lib/statistics/session_tracker.dart b/mnemo_cards_backend/lib/statistics/session_tracker.dart index a6b2044..26d83ba 100644 --- a/mnemo_cards_backend/lib/statistics/session_tracker.dart +++ b/mnemo_cards_backend/lib/statistics/session_tracker.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:collection'; import 'dart:math'; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:mnemo_cards_backend/database/database.dart'; import 'package:drift/drift.dart' as drift; @@ -45,7 +46,7 @@ class SessionTracker { // Create new session final sessionId = _generateSessionId(); - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); await _db.statisticsDao.createSession( StudySessionsCompanion.insert( @@ -116,7 +117,7 @@ class SessionTracker { wordsLearned: wordsLearned ?? session.wordsLearned, testsCompleted: testsCompleted ?? session.testsCompleted, accuracy: accuracy ?? session.accuracy, - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), ); await _db.statisticsDao.updateSession(updatedSession); @@ -155,7 +156,7 @@ class SessionTracker { if (session != null && session.endTime == null && - now.difference(session.startTime).inMinutes > _sessionTimeout.inMinutes) { + now.difference(session.startTime.dateTime).inMinutes > _sessionTimeout.inMinutes) { expiredSessions.add(sessionId); } } @@ -190,7 +191,7 @@ class SessionTracker { final session = await _db.statisticsDao.getSessionBySessionId(sessionId); if (session != null) { await _db.statisticsDao.updateSession( - session.copyWith(updatedAt: DateTime.now()), + session.copyWith(updatedAt: PgDateTime(DateTime.now())), ); } } diff --git a/mnemo_cards_backend/lib/tasks/task_manager.dart b/mnemo_cards_backend/lib/tasks/task_manager.dart index df0897d..bb1de7c 100644 --- a/mnemo_cards_backend/lib/tasks/task_manager.dart +++ b/mnemo_cards_backend/lib/tasks/task_manager.dart @@ -1,3 +1,4 @@ +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:drift/drift.dart' as drift; import 'package:mnemo_cards_backend/database/database.dart'; @@ -64,7 +65,7 @@ class TaskManager { } // Обновить статус задачи - final now = DateTime.now(); + final now = PgDateTime(DateTime.now()); await _db.taskDao.updateUserTask( task.copyWith( status: 'completed', @@ -77,7 +78,7 @@ class TaskManager { UserTaskResultsCompanion.insert( userId: userId, taskId: taskId, - results: drift.Value({'completed': true, 'completedAt': now.toIso8601String()}), + results: drift.Value({'completed': true, 'completedAt': now.dateTime.toIso8601String()}), ), ); }); diff --git a/mnemo_cards_backend/lib/user/user_manager.dart b/mnemo_cards_backend/lib/user/user_manager.dart index b6985b7..6a0ecbb 100644 --- a/mnemo_cards_backend/lib/user/user_manager.dart +++ b/mnemo_cards_backend/lib/user/user_manager.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:developer'; import 'dart:math' as math; +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:drift/drift.dart' as drift; import 'package:mnemo_cards_backend/database/database.dart'; @@ -48,7 +49,7 @@ class UserManager { final now = DateTime.now(); final token = await _db.userDao.getTokenByUserId(user.id!); if (token != null) { - if (token.expires.isAfter(now)) { + if (token.expires.dateTime.isAfter(now)) { return token.token; } await _db.userDao.deleteToken(token.id); @@ -59,7 +60,7 @@ class UserManager { token: userToken, externalUserId: externalId, userId: user.id!, - expires: now.add(const Duration(days: 360)), + expires: PgDateTime(now.add(const Duration(days: 360))), ), ); return userToken; @@ -71,7 +72,7 @@ class UserManager { return null; } final now = DateTime.now(); - if (token.expires.isBefore(now)) { + if (token.expires.dateTime.isBefore(now)) { await _db.userDao.deleteToken(token.id); return null; } @@ -98,8 +99,8 @@ class UserManager { await _db.userDao.updateUserDataPartial( UserDatasCompanion( userId: drift.Value(userId), - lastTimeOnline: drift.Value(lastOnline), - updatedAt: drift.Value(DateTime.now()), + lastTimeOnline: drift.Value(PgDateTime(lastOnline)), + updatedAt: drift.Value(PgDateTime(DateTime.now())), ), ); } @@ -137,7 +138,7 @@ class UserManager { await _db.userDao.createUserData( UserDatasCompanion.insert( userId: userId, - registrationDate: drift.Value(DateTime.now()), + registrationDate: drift.Value(PgDateTime(DateTime.now())), ), ); @@ -166,7 +167,7 @@ class UserManager { UsersCompanion( id: drift.Value(user.id!), userSettings: drift.Value(jsonEncode(settings.toJson())), - updatedAt: drift.Value(DateTime.now()), + updatedAt: drift.Value(PgDateTime(DateTime.now())), ), ); } @@ -219,7 +220,7 @@ class UserManager { // Обновить существующую статистику final updatedStat = existingStat.copyWith( results: drift.Value(updatedResults), - updatedAt: DateTime.now(), + updatedAt: PgDateTime(DateTime.now()), ); await _db.testDao.updateTestStatistics(updatedStat); } else { @@ -229,7 +230,7 @@ class UserManager { userId: user.id!, testId: testStat.testId, results: drift.Value(updatedResults), - completedAt: drift.Value(DateTime.now()), + completedAt: drift.Value(PgDateTime(DateTime.now())), ), ); } @@ -259,8 +260,8 @@ class UserManager { studyDates: drift.Value(studyDates), currentStreak: drift.Value(currentStreak), longestStreak: drift.Value(longestStreak), - lastTimeOnline: drift.Value(now), - updatedAt: drift.Value(now), + lastTimeOnline: drift.Value(PgDateTime(now)), + updatedAt: drift.Value(PgDateTime(now)), ), ); } diff --git a/mnemo_cards_backend/lib/user/user_manager_drift.dart b/mnemo_cards_backend/lib/user/user_manager_drift.dart index df83f2b..6de01c2 100644 --- a/mnemo_cards_backend/lib/user/user_manager_drift.dart +++ b/mnemo_cards_backend/lib/user/user_manager_drift.dart @@ -1,3 +1,4 @@ +import 'package:drift_postgres/drift_postgres.dart'; import 'package:injectable/injectable.dart'; import 'package:drift/drift.dart' as drift; import 'package:mnemo_cards_backend/database/database.dart'; @@ -44,7 +45,7 @@ class UserManager { final now = DateTime.now(); final token = await _db.userDao.getTokenByUserId(user.id!); if (token != null) { - if (token.expires.isAfter(now)) { + if (token.expires.dateTime.isAfter(now)) { return token.token; } await _db.userDao.deleteToken(token.id); @@ -55,7 +56,7 @@ class UserManager { token: userToken, externalUserId: externalId, userId: user.id!, - expires: now.add(const Duration(days: 360)), + expires: PgDateTime(now.add(const Duration(days: 360))), ), ); return userToken; @@ -67,7 +68,7 @@ class UserManager { return null; } final now = DateTime.now(); - if (token.expires.isBefore(now)) { + if (token.expires.dateTime.isBefore(now)) { await _db.userDao.deleteToken(token.id); return null; } @@ -94,8 +95,8 @@ class UserManager { await _db.userDao.updateUserDataPartial( UserDatasCompanion( userId: drift.Value(userId), - lastTimeOnline: drift.Value(lastOnline), - updatedAt: drift.Value(DateTime.now()), + lastTimeOnline: drift.Value(PgDateTime(lastOnline)), + updatedAt: drift.Value(PgDateTime(DateTime.now())), ), ); } @@ -133,7 +134,7 @@ class UserManager { await _db.userDao.createUserData( UserDatasCompanion.insert( userId: userId, - registrationDate: drift.Value(DateTime.now()), + registrationDate: drift.Value(PgDateTime(DateTime.now())), ), ); diff --git a/mnemo_cards_backend/pubspec.lock b/mnemo_cards_backend/pubspec.lock index ba4a56f..d2617f1 100644 --- a/mnemo_cards_backend/pubspec.lock +++ b/mnemo_cards_backend/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: "direct main" description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" auth_header: dependency: transitive description: @@ -229,10 +229,10 @@ packages: dependency: "direct main" description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.7" dart_style: dependency: transitive description: @@ -595,10 +595,10 @@ packages: dependency: "direct main" description: name: postgres - sha256: "83ba7afb0e778cc1f373e514c6110d323b81dfbaced774d3a7f4a0e21536eb45" + sha256: fefbbfe749c6130e5096588b9c4459173684c695952cd7636ab19be76f255469 url: "https://pub.dev" source: hosted - version: "3.4.8" + version: "3.5.9" pub_semver: dependency: transitive description: @@ -639,22 +639,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" - sasl_scram: - dependency: transitive - description: - name: sasl_scram - sha256: a47207a436eb650f8fdcf54a2e2587b850dc3caef9973ce01f332b07a6fc9cb9 - url: "https://pub.dev" - source: hosted - version: "0.1.1" - saslprep: - dependency: transitive - description: - name: saslprep - sha256: "3d421d10be9513bf4459c17c5e70e7b8bc718c9fc5ad4ba5eb4f5fd27396f740" - url: "https://pub.dev" - source: hosted - version: "1.0.3" shelf: dependency: "direct main" description: @@ -827,18 +811,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -895,14 +879,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - unorm_dart: - dependency: transitive - description: - name: unorm_dart - sha256: "0c69186b03ca6addab0774bcc0f4f17b88d4ce78d9d4d8f0619e30a99ead58e7" - url: "https://pub.dev" - source: hosted - version: "0.3.2" uuid: dependency: "direct main" description: diff --git a/mnemo_cards_backend/pubspec.yaml b/mnemo_cards_backend/pubspec.yaml index 6b42fa8..5e25249 100644 --- a/mnemo_cards_backend/pubspec.yaml +++ b/mnemo_cards_backend/pubspec.yaml @@ -19,9 +19,9 @@ dependencies: path: ../mnemo_cards_common_backend # PostgreSQL + Drift - drift: ^2.14.0 - drift_postgres: ^1.1.0 - postgres: ^3.0.4 + drift: ^2.30.0 + drift_postgres: ^1.3.1 + postgres: ^3.5.9 image: ^4.1.7 http: ^1.1.0 @@ -61,7 +61,7 @@ dev_dependencies: copy_with_extension_gen: ^11.0.0 # Drift code generation - drift_dev: ^2.14.0 + drift_dev: ^2.30.0 shelf_router_generator: ^1.1.3 shelf_open_api_generator: