3 files changed, 33 insertions, 40 deletions

diff --git a/model/categories.sql.go b/model/categories.sql.go
index 7df0cb3..c67e20d 100644
--- a/model/categories.sql.go
+++ b/model/categories.sql.go
@@ -10,33 +10,33 @@ import (
 )
 
 const getCategoriesOrdered = `-- name: GetCategoriesOrdered :many
-SELECT id, name
+SELECT id, name, parent_id, user_id
   FROM categories
  WHERE user_id = $1
  ORDER BY name ASC
 `
 
-type GetCategoriesOrderedRow struct {
-	ID   int32
-	Name string
-}
-
 // GetCategoriesOrdered
 //
-//	SELECT id, name
+//	SELECT id, name, parent_id, user_id
 //	  FROM categories
 //	 WHERE user_id = $1
 //	 ORDER BY name ASC
-func (q *Queries) GetCategoriesOrdered(ctx context.Context, userID int32) ([]GetCategoriesOrderedRow, error) {
+func (q *Queries) GetCategoriesOrdered(ctx context.Context, userID int32) ([]Category, error) {
 	rows, err := q.db.Query(ctx, getCategoriesOrdered, userID)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []GetCategoriesOrderedRow
+	var items []Category
 	for rows.Next() {
-		var i GetCategoriesOrderedRow
-		if err := rows.Scan(&i.ID, &i.Name); err != nil {
+		var i Category
+		if err := rows.Scan(
+			&i.ID,
+			&i.Name,
+			&i.ParentID,
+			&i.UserID,
+		); err != nil {
 			return nil, err
 		}
 		items = append(items, i)
diff --git a/model/rexps.sql.go b/model/rexps.sql.go
index 9b32c5b..9c3f1c0 100644
--- a/model/rexps.sql.go
+++ b/model/rexps.sql.go
@@ -7,39 +7,28 @@ package model
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const getRecurExpenses = `-- name: GetRecurExpenses :many
-SELECT id, description, expense, duration, start, "end"
+SELECT id, description, expense, duration, start, "end", prev_id, category_id, user_id
   FROM recur_expenses
  WHERE user_id = $1
 `
 
-type GetRecurExpensesRow struct {
-	ID          int32
-	Description pgtype.Text
-	Expense     pgtype.Numeric
-	Duration    pgtype.Interval
-	Start       pgtype.Date
-	End         pgtype.Date
-}
-
 // GetRecurExpenses
 //
-//	SELECT id, description, expense, duration, start, "end"
+//	SELECT id, description, expense, duration, start, "end", prev_id, category_id, user_id
 //	  FROM recur_expenses
 //	 WHERE user_id = $1
-func (q *Queries) GetRecurExpenses(ctx context.Context, userID int32) ([]GetRecurExpensesRow, error) {
+func (q *Queries) GetRecurExpenses(ctx context.Context, userID int32) ([]RecurExpense, error) {
 	rows, err := q.db.Query(ctx, getRecurExpenses, userID)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []GetRecurExpensesRow
+	var items []RecurExpense
 	for rows.Next() {
-		var i GetRecurExpensesRow
+		var i RecurExpense
 		if err := rows.Scan(
 			&i.ID,
 			&i.Description,
@@ -47,6 +36,9 @@ func (q *Queries) GetRecurExpenses(ctx context.Context, userID int32) ([]GetRecu
 			&i.Duration,
 			&i.Start,
 			&i.End,
+			&i.PrevID,
+			&i.CategoryID,
+			&i.UserID,
 		); err != nil {
 			return nil, err
 		}
diff --git a/model/sexps.sql.go b/model/sexps.sql.go
index 8a54443..33b9f57 100644
--- a/model/sexps.sql.go
+++ b/model/sexps.sql.go
@@ -7,36 +7,37 @@ package model
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const getSingleExpenses = `-- name: GetSingleExpenses :many
-SELECT id, description
+SELECT id, description, expense, date, corr_month, category_id, user_id
   FROM single_expenses
  WHERE user_id = $1
 `
 
-type GetSingleExpensesRow struct {
-	ID          int64
-	Description pgtype.Text
-}
-
 // GetSingleExpenses
 //
-//	SELECT id, description
+//	SELECT id, description, expense, date, corr_month, category_id, user_id
 //	  FROM single_expenses
 //	 WHERE user_id = $1
-func (q *Queries) GetSingleExpenses(ctx context.Context, userID int32) ([]GetSingleExpensesRow, error) {
+func (q *Queries) GetSingleExpenses(ctx context.Context, userID int32) ([]SingleExpense, error) {
 	rows, err := q.db.Query(ctx, getSingleExpenses, userID)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []GetSingleExpensesRow
+	var items []SingleExpense
 	for rows.Next() {
-		var i GetSingleExpensesRow
-		if err := rows.Scan(&i.ID, &i.Description); err != nil {
+		var i SingleExpense
+		if err := rows.Scan(
+			&i.ID,
+			&i.Description,
+			&i.Expense,
+			&i.Date,
+			&i.CorrMonth,
+			&i.CategoryID,
+			&i.UserID,
+		); err != nil {
 			return nil, err
 		}
 		items = append(items, i)