more fixes

yevgenypats · yevgenypats · commit 6a53a7cf444d · 2023-05-02T13:53:43.000+03:00
diff --git a/internal/servers/destination/v0/destinations.go b/internal/servers/destination/v0/destinations.go
@@ -135,13 +135,21 @@ func (s *Server) Write2(msg pb.Destination_Write2Server) error {
 			}
 			return status.Errorf(codes.InvalidArgument, "failed to unmarshal resource: %v", err)
 		}
+		table := tablesV3.Get(origResource.TableName)
+		if table == nil {
+			close(resources)
+			if wgErr := eg.Wait(); wgErr != nil {
+				return status.Errorf(codes.InvalidArgument, "failed to get table: %s and write failed: %v", origResource.TableName, wgErr)
+			}
+			return status.Errorf(codes.InvalidArgument, "failed to get table: %s", origResource.TableName)
+		}
+
 		// this is a check to keep backward compatible for sources that are not adding
 		// source and sync time
-		if len(origResource.Data) < len(tables.Get(origResource.TableName).Columns) {
+		if len(origResource.Data) < len(table.Columns) {
 			origResource.Data = append([]schemav2.CQType{sourceColumn, syncTimeColumn}, origResource.Data...)
 		}
-		tablesv2 := TablesV2ToV3(tables)
-		convertedResource := CQTypesToRecord(memory.DefaultAllocator, []schemav2.CQTypes{origResource.Data}, tablesv2.Get(origResource.TableName).ToArrowSchema())
+		convertedResource := CQTypesToRecord(memory.DefaultAllocator, []schemav2.CQTypes{origResource.Data}, table.ToArrowSchema())
 		select {
 		case resources <- convertedResource:
 		case <-ctx.Done():
diff --git a/internal/servers/destination/v0/schemav1v2.go b/internal/servers/destination/v0/schemav1v2.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/v3/types"
 )
 
-func TablesV2ToV3(tables []*schemav2.Table) schema.Tables {
+func TablesV2ToV3(tables schemav2.Tables) schema.Tables {
 	res := make(schema.Tables, len(tables))
 	for i, t := range tables {
 		res[i] = TableV2ToV3(t)
@@ -21,13 +21,17 @@ func TablesV2ToV3(tables []*schemav2.Table) schema.Tables {
 }
 
 func TableV2ToV3(table *schemav2.Table) *schema.Table {
-	return &schema.Table{
+	newTable := &schema.Table{
 		Name:          table.Name,
 		Description:   table.Description,
 		Columns:       ColumnsV2ToV3(table.Columns),
 		IgnoreInTests: table.IgnoreInTests,
 		IsIncremental: table.IsIncremental,
 	}
+	if len(table.Relations) > 0 {
+		newTable.Relations = TablesV2ToV3(table.Relations)
+	}
+	return newTable
 }
 
 func ColumnsV2ToV3(columns []schemav2.Column) []schema.Column {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/cloudquery/plugin-sdk/v3/types"`
`13`	`13`	`)`
`14`	`14`
`15`		`-func TablesV2ToV3(tables []*schemav2.Table) schema.Tables {`
	`15`	`+func TablesV2ToV3(tables schemav2.Tables) schema.Tables {`
`16`	`16`	`res := make(schema.Tables, len(tables))`
`17`	`17`	`for i, t := range tables {`
`18`	`18`	`res[i] = TableV2ToV3(t)`
`@@ -21,13 +21,17 @@ func TablesV2ToV3(tables []*schemav2.Table) schema.Tables {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func TableV2ToV3(table schemav2.Table) schema.Table {`
`24`		`- return &schema.Table{`
	`24`	`+ newTable := &schema.Table{`
`25`	`25`	`Name: table.Name,`
`26`	`26`	`Description: table.Description,`
`27`	`27`	`Columns: ColumnsV2ToV3(table.Columns),`
`28`	`28`	`IgnoreInTests: table.IgnoreInTests,`
`29`	`29`	`IsIncremental: table.IsIncremental,`
`30`	`30`	`}`
	`31`	`+ if len(table.Relations) > 0 {`
	`32`	`+ newTable.Relations = TablesV2ToV3(table.Relations)`
	`33`	`+ }`
	`34`	`+ return newTable`
`31`	`35`	`}`
`32`	`36`
`33`	`37`	`func ColumnsV2ToV3(columns []schemav2.Column) []schema.Column {`