fix dirty merge
This commit is contained in:
parent
c92611e280
commit
4d4578de7b
@ -402,14 +402,12 @@ type Usersamo struct {
|
||||
}
|
||||
|
||||
type Yclientsaccount struct {
|
||||
ID int64 `db:"id" json:"id"`
|
||||
Accountid string `db:"accountid" json:"accountid"`
|
||||
Salonid int32 `db:"salonid" json:"salonid"`
|
||||
Title string `db:"title" json:"title"`
|
||||
Shortdecription string `db:"shortdecription" json:"shortdecription"`
|
||||
Country string `db:"country" json:"country"`
|
||||
Deleted bool `db:"deleted" json:"deleted"`
|
||||
Createdat time.Time `db:"createdat" json:"createdat"`
|
||||
ID int64 `db:"id" json:"id"`
|
||||
Accountid string `db:"accountid" json:"accountid"`
|
||||
Salonid int32 `db:"salonid" json:"salonid"`
|
||||
Title string `db:"title" json:"title"`
|
||||
Deleted bool `db:"deleted" json:"deleted"`
|
||||
Createdat time.Time `db:"createdat" json:"createdat"`
|
||||
}
|
||||
|
||||
type Yclientsaccountuser struct {
|
||||
@ -469,9 +467,9 @@ type Yclientsservice struct {
|
||||
Salonserviceid int32 `db:"salonserviceid" json:"salonserviceid"`
|
||||
Title string `db:"title" json:"title"`
|
||||
Categoryid int32 `db:"categoryid" json:"categoryid"`
|
||||
Pricemin string `db:"pricemin" json:"pricemin"`
|
||||
Pricemax string `db:"pricemax" json:"pricemax"`
|
||||
Discount string `db:"discount" json:"discount"`
|
||||
Pricemin float64 `db:"pricemin" json:"pricemin"`
|
||||
Pricemax float64 `db:"pricemax" json:"pricemax"`
|
||||
Discount int32 `db:"discount" json:"discount"`
|
||||
Comment string `db:"comment" json:"comment"`
|
||||
Active bool `db:"active" json:"active"`
|
||||
Apiid string `db:"apiid" json:"apiid"`
|
||||
@ -489,12 +487,3 @@ type Yclientstimeslot struct {
|
||||
Deleted bool `db:"deleted" json:"deleted"`
|
||||
Createdat time.Time `db:"createdat" json:"createdat"`
|
||||
}
|
||||
|
||||
type Yclientstoken struct {
|
||||
Accountid string `db:"accountid" json:"accountid"`
|
||||
Salonid int32 `db:"salonid" json:"salonid"`
|
||||
Accesstoken string `db:"accesstoken" json:"accesstoken"`
|
||||
Active bool `db:"active" json:"active"`
|
||||
Expiration bool `db:"expiration" json:"expiration"`
|
||||
Createdat time.Time `db:"createdat" json:"createdat"`
|
||||
}
|
||||
|
||||
@ -150,9 +150,9 @@ type AddYclientsAccountServiceParams struct {
|
||||
Salonserviceid int32 `db:"salonserviceid" json:"salonserviceid"`
|
||||
Title string `db:"title" json:"title"`
|
||||
Categoryid int32 `db:"categoryid" json:"categoryid"`
|
||||
Pricemin string `db:"pricemin" json:"pricemin"`
|
||||
Pricemax string `db:"pricemax" json:"pricemax"`
|
||||
Discount string `db:"discount" json:"discount"`
|
||||
Pricemin float64 `db:"pricemin" json:"pricemin"`
|
||||
Pricemax float64 `db:"pricemax" json:"pricemax"`
|
||||
Discount int32 `db:"discount" json:"discount"`
|
||||
Comment string `db:"comment" json:"comment"`
|
||||
Active bool `db:"active" json:"active"`
|
||||
Apiid string `db:"apiid" json:"apiid"`
|
||||
@ -1435,7 +1435,7 @@ func (q *Queries) CreateWebHook(ctx context.Context, arg CreateWebHookParams) er
|
||||
}
|
||||
|
||||
const createYclientsAccount = `-- name: CreateYclientsAccount :one
|
||||
insert into YclientsAccounts (AccountID,SalonID,Title) values ($1,$2,$3) RETURNING id, accountid, salonid, title, shortdecription, country, deleted, createdat
|
||||
insert into YclientsAccounts (AccountID,SalonID,Title) values ($1,$2,$3) RETURNING id, accountid, salonid, title, deleted, createdat
|
||||
`
|
||||
|
||||
type CreateYclientsAccountParams struct {
|
||||
@ -1452,8 +1452,6 @@ func (q *Queries) CreateYclientsAccount(ctx context.Context, arg CreateYclientsA
|
||||
&i.Accountid,
|
||||
&i.Salonid,
|
||||
&i.Title,
|
||||
&i.Shortdecription,
|
||||
&i.Country,
|
||||
&i.Deleted,
|
||||
&i.Createdat,
|
||||
)
|
||||
@ -2365,7 +2363,7 @@ func (q *Queries) GetAllTokens(ctx context.Context) ([]Token, error) {
|
||||
}
|
||||
|
||||
const getAllYclientsAccounts = `-- name: GetAllYclientsAccounts :many
|
||||
SELECT id, accountid, salonid, title, shortdecription, country, deleted, createdat from YclientsAccounts where Deleted = false
|
||||
SELECT id, accountid, salonid, title, deleted, createdat from YclientsAccounts where Deleted = false
|
||||
`
|
||||
|
||||
func (q *Queries) GetAllYclientsAccounts(ctx context.Context) ([]Yclientsaccount, error) {
|
||||
@ -2382,8 +2380,6 @@ func (q *Queries) GetAllYclientsAccounts(ctx context.Context) ([]Yclientsaccount
|
||||
&i.Accountid,
|
||||
&i.Salonid,
|
||||
&i.Title,
|
||||
&i.Shortdecription,
|
||||
&i.Country,
|
||||
&i.Deleted,
|
||||
&i.Createdat,
|
||||
); err != nil {
|
||||
@ -2694,7 +2690,7 @@ func (q *Queries) GetCurrentCompany(ctx context.Context, accountid string) (Acco
|
||||
|
||||
const getCurrentYclientsCompany = `-- name: GetCurrentYclientsCompany :one
|
||||
|
||||
SELECT id, accountid, salonid, title, shortdecription, country, deleted, createdat FROM YclientsAccounts WHERE AccountID = $1 AND Deleted = false
|
||||
SELECT id, accountid, salonid, title, deleted, createdat FROM YclientsAccounts WHERE AccountID = $1 AND Deleted = false
|
||||
`
|
||||
|
||||
// Yclients
|
||||
@ -2706,8 +2702,6 @@ func (q *Queries) GetCurrentYclientsCompany(ctx context.Context, accountid strin
|
||||
&i.Accountid,
|
||||
&i.Salonid,
|
||||
&i.Title,
|
||||
&i.Shortdecription,
|
||||
&i.Country,
|
||||
&i.Deleted,
|
||||
&i.Createdat,
|
||||
)
|
||||
@ -3969,9 +3963,9 @@ type GetServicesYclientsWithPaginationRow struct {
|
||||
Salonserviceid int32 `db:"salonserviceid" json:"salonserviceid"`
|
||||
Title string `db:"title" json:"title"`
|
||||
Categoryid int32 `db:"categoryid" json:"categoryid"`
|
||||
Pricemin string `db:"pricemin" json:"pricemin"`
|
||||
Pricemax string `db:"pricemax" json:"pricemax"`
|
||||
Discount string `db:"discount" json:"discount"`
|
||||
Pricemin float64 `db:"pricemin" json:"pricemin"`
|
||||
Pricemax float64 `db:"pricemax" json:"pricemax"`
|
||||
Discount int32 `db:"discount" json:"discount"`
|
||||
Comment string `db:"comment" json:"comment"`
|
||||
Active bool `db:"active" json:"active"`
|
||||
Apiid string `db:"apiid" json:"apiid"`
|
||||
@ -6537,9 +6531,9 @@ type UpdateYclientsAccountServicesParams struct {
|
||||
Salonserviceid int32 `db:"salonserviceid" json:"salonserviceid"`
|
||||
Title string `db:"title" json:"title"`
|
||||
Categoryid int32 `db:"categoryid" json:"categoryid"`
|
||||
Pricemin string `db:"pricemin" json:"pricemin"`
|
||||
Pricemax string `db:"pricemax" json:"pricemax"`
|
||||
Discount string `db:"discount" json:"discount"`
|
||||
Pricemin float64 `db:"pricemin" json:"pricemin"`
|
||||
Pricemax float64 `db:"pricemax" json:"pricemax"`
|
||||
Discount int32 `db:"discount" json:"discount"`
|
||||
Comment string `db:"comment" json:"comment"`
|
||||
Active bool `db:"active" json:"active"`
|
||||
Apiid string `db:"apiid" json:"apiid"`
|
||||
|
||||
@ -60,6 +60,8 @@ packages:
|
||||
- "./dal/schema/000028_init.down.sql"
|
||||
- "./dal/schema/000029_init.up.sql"
|
||||
- "./dal/schema/000029_init.down.sql"
|
||||
- "./dal/schema/000030_init.up.sql"
|
||||
- "./dal/schema/000030_init.down.sql"
|
||||
engine: "postgresql"
|
||||
emit_json_tags: true
|
||||
emit_db_tags: true
|
||||
|
||||
Loading…
Reference in New Issue
Block a user