Merge schemas into one file

postgres/users.sql.go

@@ -13,7 +13,7 @@ const createUser = `-- name: CreateUser :one
 INSERT INTO users
 (id, email, name, password)
 VALUES ($1, $2, $3, $4)
-RETURNING email, name, password, id
+RETURNING id, email, name, password
 `
 
 type CreateUserParams struct {
@@ -32,16 +32,16 @@ func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (User, e
 	)
 	var i User
 	err := row.Scan(
+		&i.ID,
 		&i.Email,
 		&i.Name,
 		&i.Password,
-		&i.ID,
 	)
 	return i, err
 }
 
 const getUser = `-- name: GetUser :one
-SELECT email, name, password, id FROM users
+SELECT id, email, name, password FROM users
 WHERE id = $1
 `
 
@@ -49,16 +49,16 @@ func (q *Queries) GetUser(ctx context.Context, id uuid.UUID) (User, error) {
 	row := q.db.QueryRowContext(ctx, getUser, id)
 	var i User
 	err := row.Scan(
+		&i.ID,
 		&i.Email,
 		&i.Name,
 		&i.Password,
-		&i.ID,
 	)
 	return i, err
 }
 
 const getUserByUsername = `-- name: GetUserByUsername :one
-SELECT email, name, password, id FROM users
+SELECT id, email, name, password FROM users
 WHERE email = $1
 `
 
@@ -66,10 +66,10 @@ func (q *Queries) GetUserByUsername(ctx context.Context, email string) (User, er
 	row := q.db.QueryRowContext(ctx, getUserByUsername, email)
 	var i User
 	err := row.Scan(
+		&i.ID,
 		&i.Email,
 		&i.Name,
 		&i.Password,
-		&i.ID,
 	)
 	return i, err
 }