Skip to content

Commit cc6c418

Browse files
committed
chore: add DB definitions for new DB structure
This uses the soon to be deprecated database definitions in the 'db/' directory and puts them within the module that mainly uses the definitions and queries. The chainobsdb is broken down into more fine-grained sub-definitions, since not all shutter commands are using all schemas.
1 parent f05580a commit cc6c418

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3078
-19
lines changed

rolling-shutter/chainobserver/db/collator/collator.sqlc.gen.go

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rolling-shutter/chainobserver/db/collator/db.sqlc.gen.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package database
2+
3+
import (
4+
"embed"
5+
6+
"github.com/rs/zerolog/log"
7+
8+
sync "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/sync"
9+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
10+
)
11+
12+
//go:generate sqlc generate --file sql/sqlc.yaml
13+
14+
//go:embed sql
15+
var files embed.FS
16+
var Definition db.Definition
17+
18+
func init() {
19+
def, err := db.NewSQLCDefinition(files, "sql/", "chainobscollator", 1)
20+
if err != nil {
21+
log.Fatal().Err(err).Msg("failed to initialize DB metadata")
22+
}
23+
Definition = db.NewAggregateDefinition(
24+
"chainobscollator",
25+
def,
26+
sync.Definition,
27+
)
28+
}

rolling-shutter/chainobserver/db/collator/models.sqlc.gen.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- name: InsertChainCollator :exec
2+
INSERT INTO chain_collator (activation_block_number, collator)
3+
VALUES ($1, $2);
4+
5+
-- name: GetChainCollator :one
6+
SELECT * FROM chain_collator
7+
WHERE activation_block_number <= $1
8+
ORDER BY activation_block_number DESC LIMIT 1;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CREATE TABLE chain_collator(
2+
activation_block_number bigint PRIMARY KEY,
3+
collator text NOT NULL
4+
);
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: "2"
2+
sql:
3+
- schema: "schemas"
4+
queries: "queries"
5+
engine: "postgresql"
6+
gen:
7+
go:
8+
package: "database"
9+
out: "../"
10+
sql_package: "pgx/v4"
11+
output_db_file_name: "db.sqlc.gen.go"
12+
output_models_file_name: "models.sqlc.gen.go"
13+
output_files_suffix: "c.gen"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package database
2+
3+
import (
4+
collatordb "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/collator"
5+
keyperdb "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
6+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
7+
)
8+
9+
var (
10+
KeyperDefinition db.Definition = keyperdb.Definition
11+
CollatorDefinition db.Definition = collatordb.Definition
12+
)

rolling-shutter/chainobserver/db/keyper/db.sqlc.gen.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package database
2+
3+
import (
4+
"embed"
5+
6+
"github.com/rs/zerolog/log"
7+
8+
sync "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/sync"
9+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
10+
)
11+
12+
//go:generate sqlc generate --file sql/sqlc.yaml
13+
14+
//go:embed sql
15+
var files embed.FS
16+
var Definition db.Definition
17+
18+
func init() {
19+
def, err := db.NewSQLCDefinition(files, "sql/", "chainobskeyper", 1)
20+
if err != nil {
21+
log.Fatal().Err(err).Msg("failed to initialize DB metadata")
22+
}
23+
Definition = db.NewAggregateDefinition(
24+
"chainobskeyper",
25+
def,
26+
sync.Definition,
27+
)
28+
}

0 commit comments

Comments
 (0)