Always extract source information and check for undefined blocks/attrs

ohkrab · Oct 4, 2022 · 737c31b · 737c31b
1 parent 879e8e4
commit 737c31b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/krab/type_ddl_create_table.go b/krab/type_ddl_create_table.go
@@ -14,12 +14,12 @@ type DDLCreateTable struct {
 	krabhcl.Source
 
 	Name        string
-	Unlogged    bool             `hcl:"unlogged,optional"`
-	Columns     []*DDLColumn     `hcl:"column,block"`
-	PrimaryKeys []*DDLPrimaryKey `hcl:"primary_key,block"`
-	ForeignKeys []*DDLForeignKey `hcl:"foreign_key,block"`
-	Uniques     []*DDLUnique     `hcl:"unique,block"`
-	Checks      []*DDLCheck      `hcl:"check,block"`
+	Unlogged    bool
+	Columns     []*DDLColumn
+	PrimaryKeys []*DDLPrimaryKey
+	ForeignKeys []*DDLForeignKey
+	Uniques     []*DDLUnique
+	Checks      []*DDLCheck
 }
 
 var schemaCreateTable = &hcl.BodySchema{

diff --git a/krab/type_ddl_drop_index.go b/krab/type_ddl_drop_index.go
@@ -39,6 +39,14 @@ func (d *DDLDropIndex) DecodeHCL(ctx *hcl.EvalContext, block *hcl.Block) error {
 		return fmt.Errorf("failed to decode `%s` block: %s", block.Type, diags.Error())
 	}
 
+	for _, b := range content.Blocks {
+		switch b.Type {
+
+		default:
+			return fmt.Errorf("Unknown block `%s` for `%s` block", b.Type, block.Type)
+		}
+	}
+
 	for k, v := range content.Attributes {
 		switch k {
 		case "concurrently":

diff --git a/krab/type_ddl_generated_column.go b/krab/type_ddl_generated_column.go
@@ -10,6 +10,8 @@ import (
 
 // DDLGeneratedColumn DSL.
 type DDLGeneratedColumn struct {
+	krabhcl.Source
+
 	As string
 }
 
@@ -22,6 +24,8 @@ var schemaGeneratedColumn = &hcl.BodySchema{
 
 // DecodeHCL parses HCL into struct.
 func (d *DDLGeneratedColumn) DecodeHCL(ctx *hcl.EvalContext, block *hcl.Block) error {
+	d.Source.Extract(block)
+
 	content, diags := block.Body.Content(schemaGeneratedColumn)
 	if diags.HasErrors() {
 		return fmt.Errorf("failed to decode `%s` block: %s", block.Type, diags.Error())

diff --git a/krab/type_ddl_identity.go b/krab/type_ddl_identity.go
@@ -5,10 +5,12 @@ import (
 	"io"
 
 	"github.com/hashicorp/hcl/v2"
+	"github.com/ohkrab/krab/krabhcl"
 )
 
 // DDLIdentity DSL.
 type DDLIdentity struct {
+	krabhcl.Source
 }
 
 var schemaIdentity = &hcl.BodySchema{
@@ -18,6 +20,8 @@ var schemaIdentity = &hcl.BodySchema{
 
 // DecodeHCL parses HCL into struct.
 func (d *DDLIdentity) DecodeHCL(ctx *hcl.EvalContext, block *hcl.Block) error {
+	d.Source.Extract(block)
+
 	content, diags := block.Body.Content(schemaColumn)
 	if diags.HasErrors() {
 		return fmt.Errorf("failed to decode `%s` block: %s", block.Type, diags.Error())

diff --git a/krab/type_ddl_primary_key.go b/krab/type_ddl_primary_key.go
@@ -12,6 +12,8 @@ import (
 
 // DDLPrimaryKey constraint DSL for table DDL.
 type DDLPrimaryKey struct {
+	krabhcl.Source
+
 	Columns []string
 	Include []string
 }
@@ -26,6 +28,8 @@ var schemaPrimaryKey = &hcl.BodySchema{
 
 // DecodeHCL parses HCL into struct.
 func (d *DDLPrimaryKey) DecodeHCL(ctx *hcl.EvalContext, block *hcl.Block) error {
+	d.Source.Extract(block)
+
 	d.Columns = []string{}
 	d.Include = []string{}
 

diff --git a/krab/type_ddl_references.go b/krab/type_ddl_references.go
@@ -12,6 +12,8 @@ import (
 
 // DDLReferences DSL for ForeignKey.
 type DDLReferences struct {
+	krabhcl.Source
+
 	Table    string
 	Columns  []string
 	OnDelete string
@@ -29,6 +31,8 @@ var schemaForeignKeyReferences = &hcl.BodySchema{
 
 // DecodeHCL parses HCL into struct.
 func (d *DDLReferences) DecodeHCL(ctx *hcl.EvalContext, block *hcl.Block) error {
+	d.Source.Extract(block)
+
 	d.Columns = []string{}
 	d.Table = block.Labels[0]
 

diff --git a/krab/type_ddl_unique.go b/krab/type_ddl_unique.go
@@ -12,6 +12,8 @@ import (
 
 // DDLUnique constraint DSL for table DDL.
 type DDLUnique struct {
+	krabhcl.Source
+
 	Columns []string
 	Include []string
 }
@@ -26,6 +28,8 @@ var schemaUnique = &hcl.BodySchema{
 
 // DecodeHCL parses HCL into struct.
 func (d *DDLUnique) DecodeHCL(ctx *hcl.EvalContext, block *hcl.Block) error {
+	d.Source.Extract(block)
+
 	d.Columns = []string{}
 	d.Include = []string{}