From cecdcb20e1d5bc120f371b98c238c05f3f6092eb Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Mon, 5 Dec 2022 17:20:30 +0100 Subject: [PATCH 1/7] Fix equal dates issue --- storage/vehicles.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/vehicles.go b/storage/vehicles.go index 2661cf2..fd9c525 100644 --- a/storage/vehicles.go +++ b/storage/vehicles.go @@ -26,9 +26,9 @@ func (v Vehicle) Free(start time.Time, end time.Time) bool { for _, b := range v.Bookings { fmt.Println("Bookings for", v) fmt.Println(b) - if (start.Before(b.Unavailablefrom) && end.After(b.Unavailablefrom.Add(24*time.Hour))) || - (start.Before(b.Unavailableto) && end.After(b.Unavailableto.Add(24*time.Hour))) || - (start.After(b.Unavailablefrom) && end.Before(b.Unavailableto.Add(24*time.Hour))) { + if ((start.Before(b.Unavailablefrom) || start.Equal(b.Unavailablefrom)) && (end.After(b.Unavailablefrom.Add(24*time.Hour)) || end.Equal(b.Unavailablefrom.Add(24*time.Hour)))) || + ((start.Before(b.Unavailableto) || start.Equal(b.Unavailableto)) && (end.After(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.Add(24*time.Hour)))) || + ((start.After(b.Unavailablefrom) || start.Equal(b.Unavailablefrom)) && (end.Before(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.Add(24*time.Hour)))) { return false } } From 91991789db9b3fb6ecaba3e72fdf1ead0aa8f2a7 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Mon, 5 Dec 2022 19:15:18 +0100 Subject: [PATCH 2/7] Avoid saving entire vehicle in database --- storage/bookings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/bookings.go b/storage/bookings.go index ed8a3e3..7c48857 100644 --- a/storage/bookings.go +++ b/storage/bookings.go @@ -19,7 +19,7 @@ type Booking struct { Data map[string]any `json:"data"` Deleted bool - Vehicle Vehicle + Vehicle Vehicle `json:"vehicle" bson:"-"` } func (b Booking) Status() int { From feb935f8bf4e50ee0fb04492fea357122cb2cf3d Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Fri, 10 Mar 2023 15:44:46 +0100 Subject: [PATCH 3/7] Filter vehicle administrators --- grpcapi/grpcapi.go | 3 ++- main.go | 4 ++++ storage/vehicles.go | 22 +++++++++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/grpcapi/grpcapi.go b/grpcapi/grpcapi.go index 6938c09..6a5ea86 100644 --- a/grpcapi/grpcapi.go +++ b/grpcapi/grpcapi.go @@ -55,7 +55,8 @@ func (s FleetsServerImpl) GetVehicle(ctx context.Context, req *GetVehicleRequest func (s FleetsServerImpl) GetVehicles(ctx context.Context, req *GetVehiclesRequest) (*GetVehiclesResponse, error) { filter := storage.VehicleFilters{ - Types: req.Types, + Types: req.Types, + Administrators: req.Administrators, } if req.AvailabilityFrom.IsValid() { filter.AvailableFrom = req.AvailabilityFrom.AsTime() diff --git a/main.go b/main.go index 9527b9a..2ca8d12 100644 --- a/main.go +++ b/main.go @@ -18,6 +18,7 @@ func main() { var ( service_name = cfg.GetString("name") grpc_enable = cfg.GetBool("services.grpc.enable") + dev_env = cfg.GetBool("dev_env") ) storage, err := storage.NewStorage(cfg) @@ -28,6 +29,9 @@ func main() { handler := handlers.NewHandler(cfg, storage) fmt.Println("Running", service_name, ":") + if dev_env { + fmt.Printf("\033]0;%s\007", service_name) + } failed := make(chan error) diff --git a/storage/vehicles.go b/storage/vehicles.go index fd9c525..e4da167 100644 --- a/storage/vehicles.go +++ b/storage/vehicles.go @@ -17,9 +17,10 @@ type Vehicle struct { } type VehicleFilters struct { - Types []string - AvailableFrom time.Time - AvailableTo time.Time + Types []string + Administrators []string + AvailableFrom time.Time + AvailableTo time.Time } func (v Vehicle) Free(start time.Time, end time.Time) bool { @@ -49,6 +50,21 @@ func (v Vehicle) MatchesFilters(filters VehicleFilters) bool { } } + if len(filters.Administrators) > 0 { + found := false + for _, a := range filters.Administrators { + for _, va := range v.Administrators { + if a == va { + found = true + break + } + } + } + if !found { + return false + } + } + if !v.Free(filters.AvailableFrom, filters.AvailableTo) { return false } From 8a271fdcf8f051544b30e099e9db550386a5f981 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Fri, 10 Mar 2023 16:10:32 +0100 Subject: [PATCH 4/7] nothing special --- storage/vehicles.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/storage/vehicles.go b/storage/vehicles.go index e4da167..0b8b8a7 100644 --- a/storage/vehicles.go +++ b/storage/vehicles.go @@ -25,8 +25,6 @@ type VehicleFilters struct { func (v Vehicle) Free(start time.Time, end time.Time) bool { for _, b := range v.Bookings { - fmt.Println("Bookings for", v) - fmt.Println(b) if ((start.Before(b.Unavailablefrom) || start.Equal(b.Unavailablefrom)) && (end.After(b.Unavailablefrom.Add(24*time.Hour)) || end.Equal(b.Unavailablefrom.Add(24*time.Hour)))) || ((start.Before(b.Unavailableto) || start.Equal(b.Unavailableto)) && (end.After(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.Add(24*time.Hour)))) || ((start.After(b.Unavailablefrom) || start.Equal(b.Unavailablefrom)) && (end.Before(b.Unavailableto.Add(24*time.Hour)) || end.Equal(b.Unavailableto.Add(24*time.Hour)))) { @@ -37,6 +35,8 @@ func (v Vehicle) Free(start time.Time, end time.Time) bool { } func (v Vehicle) MatchesFilters(filters VehicleFilters) bool { + fmt.Println("Filters : ", filters) + if len(filters.Types) > 0 { found := false for _, t := range filters.Types { @@ -69,7 +69,5 @@ func (v Vehicle) MatchesFilters(filters VehicleFilters) bool { return false } - fmt.Println(filters) - return true } From 011466fb1445b927f53a978541857c3873ddd85e Mon Sep 17 00:00:00 2001 From: sbouaram Date: Fri, 12 May 2023 15:12:55 +0200 Subject: [PATCH 5/7] adding psql --- .gitignore | 1 + storage/postgresql.go | 577 ++++++++++++++++++++++++++++++++++ storage/postgresql/schema.hcl | 88 ++++++ storage/storage.go | 3 + 4 files changed, 669 insertions(+) create mode 100644 storage/postgresql.go create mode 100644 storage/postgresql/schema.hcl diff --git a/.gitignore b/.gitignore index f702e7b..f77345f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ config.yaml .vscode +.idea __debug_bin \ No newline at end of file diff --git a/storage/postgresql.go b/storage/postgresql.go new file mode 100644 index 0000000..8eafed6 --- /dev/null +++ b/storage/postgresql.go @@ -0,0 +1,577 @@ +package storage + +import ( + "ariga.io/atlas/sql/postgres" + "ariga.io/atlas/sql/schema" + "context" + "database/sql" + "encoding/json" + "fmt" + "github.com/lib/pq" + _ "github.com/lib/pq" + "github.com/spf13/viper" + "os" + "strconv" +) + +type PostgresqlStorage struct { + DbConnection *sql.DB + Schema string + Tables map[string]string +} + +func NewPostgresqlStorage(cfg *viper.Viper) (PostgresqlStorage, error) { + var ( + host = cfg.GetString("storage.db.psql.host") + port = cfg.GetString("storage.db.psql.port") + user = cfg.GetString("storage.db.psql.user") + password = cfg.GetString("storage.db.psql.password") + dbname = cfg.GetString("storage.db.psql.dbname") + sslmode = cfg.GetString("storage.db.psql.sslmode") + pg_schema = cfg.GetString("storage.db.psql.schema") + pgtables_vehicle = cfg.GetString("storage.db.psql.tables.vehicle") + pgtables_booking = cfg.GetString("storage.db.psql.tables.booking") + timezone = "Europe/Paris" + ) + portInt, _ := strconv.Atoi(port) + psqlconn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s TimeZone=%s", host, portInt, + user, password, dbname, sslmode, timezone) + db, err := sql.Open("postgres", psqlconn) + if err != nil { + fmt.Println("error", err) + return PostgresqlStorage{}, fmt.Errorf("connection to postgresql failed") + } + err = db.Ping() + if err != nil { + fmt.Println(err) + return PostgresqlStorage{}, fmt.Errorf("connection to postgresql database failed") + } + return PostgresqlStorage{ + DbConnection: db, + Schema: pg_schema, + Tables: map[string]string{ + "vehicle": fmt.Sprintf("%s.%s", pg_schema, pgtables_vehicle), + "booking": fmt.Sprintf("%s.%s", pg_schema, pgtables_booking), + }, + }, nil +} + +func (psql PostgresqlStorage) CreateVehicle(vehicle Vehicle) error { + tx, err := psql.DbConnection.Begin() + if err != nil { + return fmt.Errorf("failed to begin transaction: %w", err) + } + vehicleQuery := fmt.Sprintf(` + INSERT INTO %s (id, type, namespace, administrators, data, metadata) + VALUES ($1, $2, $3, $4, $5, $6) + `, psql.Tables["vehicle"]) + data, err := json.Marshal(vehicle.Data) + if err != nil { + return err + } + metadata, err := json.Marshal(vehicle.Metadata) + if err != nil { + return err + } + _, err = tx.Exec(vehicleQuery, vehicle.ID, vehicle.Type, vehicle.Namespace, pq.Array(vehicle.Administrators), + data, metadata) + if err != nil { + tx.Rollback() + return fmt.Errorf("failed to insert vehicle: %w", err) + } + bookingQuery := fmt.Sprintf(` + INSERT INTO %s (id, vehicleid, driver, startdate, enddate, unavailablefrom, unavailableto, data, deleted) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) + `, psql.Tables["booking"]) + + for _, booking := range vehicle.Bookings { + dataBooking, err := json.Marshal(booking.Data) + if err != nil { + return err + } + _, err = tx.Exec(bookingQuery, booking.ID, booking.Vehicleid, booking.Driver, + booking.Startdate, booking.Enddate, booking.Unavailablefrom, booking.Unavailableto, + dataBooking, booking.Deleted) + if err != nil { + tx.Rollback() + return fmt.Errorf("failed to insert booking: %w", err) + } + } + err = tx.Commit() + if err != nil { + tx.Rollback() + return fmt.Errorf("failed to commit transaction: %w", err) + } + return nil +} + +func (psql PostgresqlStorage) GetVehicle(id string) (*Vehicle, error) { + vehicle := &Vehicle{} + var vehicleData []byte + var vehicleMetadata []byte + query := fmt.Sprintf(` + SELECT id, type, namespace, administrators, data, metadata + FROM %s + WHERE id = $1 + `, psql.Tables["vehicle"]) + + err := psql.DbConnection.QueryRow(query, id).Scan( + &vehicle.ID, + &vehicle.Type, + &vehicle.Namespace, + pq.Array(&vehicle.Administrators), + &vehicleData, + &vehicleMetadata, + ) + err = json.Unmarshal(vehicleData, &vehicle.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle data") + } + err = json.Unmarshal(vehicleMetadata, &vehicle.Metadata) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle metadata") + } + if err != nil { + if err == sql.ErrNoRows { + return nil, fmt.Errorf("vehicle not found") + } + return nil, fmt.Errorf("failed to query database: %w", err) + } + + return vehicle, nil +} + +func (psql PostgresqlStorage) GetVehicles(namespaces []string) ([]Vehicle, error) { + var vehicles []Vehicle + if len(namespaces) == 0 { + return vehicles, nil + } + + query := fmt.Sprintf(` + SELECT id, type, namespace, administrators, data, metadata + FROM %s + WHERE namespace = ANY($1) +`, psql.Tables["vehicle"]) + + rows, err := psql.DbConnection.Query(query, pq.Array(namespaces)) + if err != nil { + return nil, fmt.Errorf("failed to query database: %w", err) + } + defer rows.Close() + + for rows.Next() { + var vehicle Vehicle + var administrators []string + var vehicleData []byte + var vehicleMetadata []byte + + scanArgs := []interface{}{ + &vehicle.ID, + &vehicle.Type, + &vehicle.Namespace, + pq.Array(&administrators), + &vehicleData, + &vehicleMetadata, + } + + err := rows.Scan(scanArgs...) + if err != nil { + return nil, fmt.Errorf("failed to scan row: %w", err) + } + + vehicle.Administrators = administrators + err = json.Unmarshal(vehicleData, &vehicle.Data) + if err != nil { + return nil, err + } + err = json.Unmarshal(vehicleMetadata, &vehicle.Metadata) + if err != nil { + return nil, err + } + + vehicles = append(vehicles, vehicle) + } + + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("unexpected error after iterating rows: %w", err) + } + + return vehicles, nil +} + +func (psql PostgresqlStorage) CreateBooking(booking Booking) error { + query := fmt.Sprintf(` + INSERT INTO %s (id, vehicleid, driver, startdate, enddate, unavailablefrom, unavailableto, data, deleted) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) + `, psql.Tables["booking"]) + + bookingData, err := json.Marshal(booking.Data) + if err != nil { + return fmt.Errorf("failed to marshal booking data: %w", err) + } + + _, err = psql.DbConnection.Exec(query, booking.ID, booking.Vehicleid, booking.Driver, booking.Startdate, + booking.Enddate, booking.Unavailablefrom, booking.Unavailableto, bookingData, booking.Deleted) + if err != nil { + return fmt.Errorf("failed to insert booking record: %w", err) + } + return nil +} + +func (psql PostgresqlStorage) UpdateBooking(bookingToUpdate Booking) error { + query := fmt.Sprintf(` + UPDATE %s SET + driver = $1, + startdate = $2, + enddate = $3, + unavailablefrom = $4, + unavailableto = $5, + data = $6, + deleted = $7 + WHERE id = $8 + `, psql.Tables["booking"]) + + bookingData, err := json.Marshal(bookingToUpdate.Data) + if err != nil { + return fmt.Errorf("failed to marshal booking data: %w", err) + } + + _, err = psql.DbConnection.Exec( + query, + bookingToUpdate.Driver, + bookingToUpdate.Startdate, + bookingToUpdate.Enddate, + bookingToUpdate.Unavailablefrom, + bookingToUpdate.Unavailableto, + bookingData, + bookingToUpdate.Deleted, + bookingToUpdate.ID, + ) + + if err != nil { + return fmt.Errorf("failed to update booking: %w", err) + } + + return nil +} +func (psql PostgresqlStorage) GetBooking(id string) (*Booking, error) { + booking := &Booking{} + + query := fmt.Sprintf(` + SELECT b.id, b.vehicleid, b.driver, b.startdate, b.enddate, + b.unavailablefrom, b.unavailableto, b.data, b.deleted, + v.id, v.type, v.namespace, v.administrators, v.data, v.metadata + FROM %s b + LEFT JOIN %s v ON b.vehicleid = v.id + WHERE b.id = $1 + `, psql.Tables["booking"], psql.Tables["vehicle"]) + + row := psql.DbConnection.QueryRow(query, id) + + var administrators []string + var bookingData []byte + var vehicleData []byte + var vehicleMetadata []byte + + err := row.Scan( + &booking.ID, + &booking.Vehicleid, + &booking.Driver, + &booking.Startdate, + &booking.Enddate, + &booking.Unavailablefrom, + &booking.Unavailableto, + &bookingData, + &booking.Deleted, + &booking.Vehicle.ID, + &booking.Vehicle.Type, + &booking.Vehicle.Namespace, + pq.Array(&administrators), + &vehicleData, + &vehicleMetadata, + ) + + if err != nil { + return nil, fmt.Errorf("error receiving booking: %w", err) + } + + err = json.Unmarshal(bookingData, &booking.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal booking data: %w", err) + } + + err = json.Unmarshal(vehicleData, &booking.Vehicle.Data) + if err != nil { + return nil, err + } + err = json.Unmarshal(vehicleMetadata, &booking.Vehicle.Metadata) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle metadata: %w", err) + } + + booking.Vehicle.Administrators = administrators + + return booking, nil +} + +func (psql PostgresqlStorage) GetBookings() ([]Booking, error) { + var bookings []Booking + + query := fmt.Sprintf(` + SELECT b.id, b.vehicleid, b.driver, b.startdate, b.enddate, + b.unavailablefrom, b.unavailableto, b.data, b.deleted, + v.id, v.type, v.namespace, v.administrators, v.data, v.metadata + FROM %s b + LEFT JOIN %s v ON b.vehicleid = v.id + `, psql.Tables["booking"], psql.Tables["vehicle"]) + + rows, err := psql.DbConnection.Query(query) + if err != nil { + return nil, fmt.Errorf("failed to retrieve bookings: %w", err) + } + + defer rows.Close() + + for rows.Next() { + var booking Booking + + var administrators []string + var bookingData []byte + var vehicleData []byte + var vehicleMetadata []byte + + err = rows.Scan( + &booking.ID, + &booking.Vehicleid, + &booking.Driver, + &booking.Startdate, + &booking.Enddate, + &booking.Unavailablefrom, + &booking.Unavailableto, + &bookingData, + &booking.Deleted, + &booking.Vehicle.ID, + &booking.Vehicle.Type, + &booking.Vehicle.Namespace, + pq.Array(&administrators), + &vehicleData, + &vehicleMetadata, + ) + + if err != nil { + return nil, fmt.Errorf("error receiving booking: %w", err) + } + + err = json.Unmarshal(bookingData, &booking.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal booking data: %w", err) + } + + err = json.Unmarshal(vehicleData, &booking.Vehicle.Data) + if err != nil { + return nil, err + } + + err = json.Unmarshal(vehicleMetadata, &booking.Vehicle.Metadata) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle metadata: %w", err) + } + + booking.Vehicle.Administrators = administrators + + bookings = append(bookings, booking) + } + + if err = rows.Err(); err != nil { + return nil, fmt.Errorf("failed to retrieve bookings: %w", err) + } + + return bookings, nil +} +func (psql PostgresqlStorage) GetBookingsForVehicle(vehicleid string) ([]Booking, error) { + var bookings []Booking + + query := fmt.Sprintf(` + SELECT b.id, b.vehicleid, b.driver, b.startdate, b.enddate, + b.unavailablefrom, b.unavailableto, b.data, b.deleted, + v.id, v.type, v.namespace, v.administrators, v.data, v.metadata + FROM %s b + LEFT JOIN %s v ON b.vehicleid = v.id + WHERE b.vehicleid = $1 + `, psql.Tables["booking"], psql.Tables["vehicle"]) + + rows, err := psql.DbConnection.Query(query, vehicleid) + if err != nil { + return nil, fmt.Errorf("error retrieving bookings for vehicle: %w", err) + } + + for rows.Next() { + var administrators []string + var bookingData []byte + var vehicleData []byte + var vehicleMetadata []byte + var booking Booking + + err := rows.Scan( + &booking.ID, + &booking.Vehicleid, + &booking.Driver, + &booking.Startdate, + &booking.Enddate, + &booking.Unavailablefrom, + &booking.Unavailableto, + &bookingData, + &booking.Deleted, + &booking.Vehicle.ID, + &booking.Vehicle.Type, + &booking.Vehicle.Namespace, + pq.Array(&administrators), + &vehicleData, + &vehicleMetadata, + ) + + if err != nil { + return nil, fmt.Errorf("error scanning booking row: %w", err) + } + + err = json.Unmarshal(bookingData, &booking.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal booking data: %w", err) + } + + err = json.Unmarshal(vehicleData, &booking.Vehicle.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle data: %w", err) + } + + err = json.Unmarshal(vehicleMetadata, &booking.Vehicle.Metadata) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle metadata: %w", err) + } + + booking.Vehicle.Administrators = administrators + bookings = append(bookings, booking) + } + + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("error iterating over booking rows: %w", err) + } + + return bookings, nil +} +func (psql PostgresqlStorage) GetBookingsForDriver(driver string) ([]Booking, error) { + bookings := []Booking{} + + query := fmt.Sprintf(` + SELECT b.id, b.vehicleid, b.driver, b.startdate, b.enddate, + b.unavailablefrom, b.unavailableto, b.data, b.deleted, + v.id, v.type, v.namespace, v.administrators, v.data, v.metadata + FROM %s b + LEFT JOIN %s v ON b.vehicleid = v.id + WHERE b.driver = $1 + `, psql.Tables["booking"], psql.Tables["vehicle"]) + + rows, err := psql.DbConnection.Query(query, driver) + if err != nil { + return nil, fmt.Errorf("error querying bookings: %w", err) + } + + defer rows.Close() + + for rows.Next() { + booking := Booking{} + var administrators []string + var bookingData []byte + var vehicleData []byte + var vehicleMetadata []byte + + err = rows.Scan( + &booking.ID, + &booking.Vehicleid, + &booking.Driver, + &booking.Startdate, + &booking.Enddate, + &booking.Unavailablefrom, + &booking.Unavailableto, + &bookingData, + &booking.Deleted, + &booking.Vehicle.ID, + &booking.Vehicle.Type, + &booking.Vehicle.Namespace, + pq.Array(&administrators), + &vehicleData, + &vehicleMetadata, + ) + + if err != nil { + return nil, fmt.Errorf("error scanning bookings: %w", err) + } + + err = json.Unmarshal(bookingData, &booking.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal booking data: %w", err) + } + + err = json.Unmarshal(vehicleData, &booking.Vehicle.Data) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle data: %w", err) + } + err = json.Unmarshal(vehicleMetadata, &booking.Vehicle.Metadata) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal vehicle metadata: %w", err) + } + + booking.Vehicle.Administrators = administrators + + bookings = append(bookings, booking) + } + + return bookings, nil +} + +func (psql PostgresqlStorage) DeleteBooking(id string) error { + query := fmt.Sprintf(` + DELETE FROM %s + WHERE id = $1 + `, psql.Tables["booking"]) + _, err := psql.DbConnection.Exec(query, id) + if err != nil { + return fmt.Errorf("error deleting booking: %v", err) + } + return nil +} + +func (psql PostgresqlStorage) Migrate() error { + ctx := context.Background() + driver, err := postgres.Open(psql.DbConnection) + if err != nil { + return err + } + existing, err := driver.InspectRealm(ctx, &schema.InspectRealmOption{Schemas: []string{psql.Schema}}) + if err != nil { + return err + } + + var desired schema.Realm + + hcl, err := os.ReadFile("postgresql/schema.hcl") + if err != nil { + return err + } + + err = postgres.EvalHCLBytes(hcl, &desired, nil) + if err != nil { + return err + } + + diff, err := driver.RealmDiff(existing, &desired) + if err != nil { + return err + } + + err = driver.ApplyChanges(ctx, diff) + if err != nil { + return err + } + return nil +} diff --git a/storage/postgresql/schema.hcl b/storage/postgresql/schema.hcl new file mode 100644 index 0000000..37d7dfb --- /dev/null +++ b/storage/postgresql/schema.hcl @@ -0,0 +1,88 @@ +table "booking" { + schema = schema.fleets + column "id" { + null = false + type = uuid + } + column "vehicleid" { + null = true + type = uuid + } + column "driver" { + null = true + type = text + } + column "startdate" { + null = true + type = timestamptz + } + column "enddate" { + null = true + type = timestamptz + } + column "unavailablefrom" { + null = true + type = timestamptz + } + column "unavailableto" { + null = true + type = timestamptz + } + column "data" { + null = true + type = jsonb + } + column "deleted" { + null = true + type = boolean + } + primary_key { + columns = [column.id] + } + foreign_key "booking_vehicleid_fkey" { + columns = [column.vehicleid] + ref_columns = [table.vehicle.column.id] + on_update = NO_ACTION + on_delete = NO_ACTION + } + foreign_key "vehicle_booking_fk" { + columns = [column.vehicleid] + ref_columns = [table.vehicle.column.id] + on_update = NO_ACTION + on_delete = NO_ACTION + } +} + +table "vehicle" { + schema = schema.fleets + column "id" { + null = false + type = uuid + } + column "type" { + null = true + type = text + } + column "namespace" { + null = true + type = text + } + column "administrators" { + null = true + type = sql("text[]") + } + column "data" { + null = true + type = jsonb + } + column "metadata" { + null = true + type = jsonb + } + primary_key { + columns = [column.id] + } +} + +schema "fleets" { +} diff --git a/storage/storage.go b/storage/storage.go index 399ca39..a7a0160 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -31,6 +31,9 @@ func NewStorage(cfg *viper.Viper) (Storage, error) { case "mongodb": s, err := NewMongoDBStorage(cfg) return s, err + case "psql": + s, err := NewPostgresqlStorage(cfg) + return s, err default: return nil, fmt.Errorf("storage type %v is not supported", storage_type) } From 44d2b00cd48030b54dd121856aba2ddd02126007 Mon Sep 17 00:00:00 2001 From: mfrigo Date: Wed, 6 Sep 2023 13:36:02 +0200 Subject: [PATCH 6/7] [+] create branch mika --- go.mod | 13 +++++++++++-- go.sum | 44 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index bf4ac87..a160331 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,9 @@ module git.coopgo.io/coopgo-platform/fleets go 1.18 require ( + ariga.io/atlas v0.13.1 github.com/google/uuid v1.3.0 + github.com/lib/pq v1.10.9 github.com/spf13/viper v1.12.0 go.mongodb.org/mongo-driver v1.10.1 google.golang.org/grpc v1.46.2 @@ -11,12 +13,18 @@ require ( ) require ( + github.com/agext/levenshtein v1.2.1 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/go-openapi/inflect v0.19.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.1 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/hcl/v2 v2.10.0 // indirect github.com/klauspost/compress v1.13.6 // indirect github.com/magiconair/properties v1.8.6 // indirect + github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect github.com/pelletier/go-toml v1.9.5 // indirect @@ -31,11 +39,12 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect + github.com/zclconf/go-cty v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.8.0 // indirect google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index e1a5ed2..1d3c247 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +ariga.io/atlas v0.13.1 h1:oSkEYgI3qUnQZ6b6+teAEiIuizjBvkZ4YDbz0XWfCdQ= +ariga.io/atlas v0.13.1/go.mod h1:+TR129FJZ5Lvzms6dvCeGWh1yR6hMvmXBhug4hrNIGk= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -38,7 +40,14 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8= +github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= +github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= +github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= +github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -69,6 +78,10 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= +github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= +github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -80,6 +93,7 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -113,6 +127,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -127,7 +142,6 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -139,6 +153,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/hcl/v2 v2.10.0 h1:1S1UnuhDGlv3gRFV4+0EdwB+znNP5HmcGbIqwnSCByg= +github.com/hashicorp/hcl/v2 v2.10.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -152,8 +168,14 @@ github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= @@ -171,12 +193,15 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= @@ -193,6 +218,9 @@ github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= +github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= +github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= @@ -205,6 +233,10 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= +github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA= +github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.mongodb.org/mongo-driver v1.10.1 h1:NujsPveKwHaWuKUer/ceo9DzEe7HIj1SlJ6uvXZG0S4= go.mongodb.org/mongo-driver v1.10.1/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -215,6 +247,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -257,6 +290,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -317,6 +351,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -350,8 +385,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -361,8 +396,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 4674c75a9f13764c731e151b06b5e15d1f0c607a Mon Sep 17 00:00:00 2001 From: mfrigo Date: Fri, 24 Nov 2023 17:11:03 +0100 Subject: [PATCH 7/7] merge fleets --- storage/postgresql.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/storage/postgresql.go b/storage/postgresql.go index 8eafed6..2eb1b3b 100644 --- a/storage/postgresql.go +++ b/storage/postgresql.go @@ -1,17 +1,18 @@ package storage import ( - "ariga.io/atlas/sql/postgres" - "ariga.io/atlas/sql/schema" "context" "database/sql" "encoding/json" "fmt" + "os" + "strconv" + + "ariga.io/atlas/sql/postgres" + "ariga.io/atlas/sql/schema" "github.com/lib/pq" _ "github.com/lib/pq" "github.com/spf13/viper" - "os" - "strconv" ) type PostgresqlStorage struct {