[FIX] Fix formula type output when FormulaTreatBlanksAs is blank. Fix Criteria sharing rule output when BooleanFilter is blank

shellyln · shellyln · commit 1b44a70036da · 2025-05-01T12:20:49.000+09:00
diff --git a/pkg/driver/convert.go b/pkg/driver/convert.go
@@ -195,7 +195,11 @@ func convertFields(config *CfDriverConfig, schema *Schema, table *Table,
 			column.ExtraDef = fldMeta.DisplayFormat
 		}
 		if len(fldMeta.Formula) > 0 {
-			column.Type = "Formula(" + fldMeta.Type + ", " + fldMeta.FormulaTreatBlanksAs + ")"
+			if len(fldMeta.FormulaTreatBlanksAs) > 0 {
+				column.Type = "Formula(" + fldMeta.Type + ", " + fldMeta.FormulaTreatBlanksAs + ")"
+			} else {
+				column.Type = "Formula(" + fldMeta.Type + ")"
+			}
 			column.ExtraDef = fldMeta.Formula
 		}
 
diff --git a/pkg/driver/convsf.go b/pkg/driver/convsf.go
@@ -1,7 +1,7 @@
 package driver
 
 func (s *SfSharingBaseCriteriaRule) getCriteria() string {
-	desc := "{" + s.BooleanFilter
+	desc := s.BooleanFilter
 
 	for _, v := range s.CriteriaItems {
 		if len(desc) > 0 {
@@ -10,8 +10,7 @@ func (s *SfSharingBaseCriteriaRule) getCriteria() string {
 		desc += v.Field + " " + v.Operation + " " + v.Value + v.ValueField
 	}
 
-	desc += "}"
-	return desc
+	return "{" + desc + "}"
 }
 
 func (s *SfSharingCriteriaRule) ToDescription() string {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,11 @@ func convertFields(config CfDriverConfig, schema Schema, table *Table,`
`195`	`195`	`column.ExtraDef = fldMeta.DisplayFormat`
`196`	`196`	`}`
`197`	`197`	`if len(fldMeta.Formula) > 0 {`
`198`		`- column.Type = "Formula(" + fldMeta.Type + ", " + fldMeta.FormulaTreatBlanksAs + ")"`
	`198`	`+ if len(fldMeta.FormulaTreatBlanksAs) > 0 {`
	`199`	`+ column.Type = "Formula(" + fldMeta.Type + ", " + fldMeta.FormulaTreatBlanksAs + ")"`
	`200`	`+ } else {`
	`201`	`+ column.Type = "Formula(" + fldMeta.Type + ")"`
	`202`	`+ }`
`199`	`203`	`column.ExtraDef = fldMeta.Formula`
`200`	`204`	`}`
`201`	`205`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package driver`
`2`	`2`
`3`	`3`	`func (s *SfSharingBaseCriteriaRule) getCriteria() string {`
`4`		`- desc := "{" + s.BooleanFilter`
	`4`	`+ desc := s.BooleanFilter`
`5`	`5`
`6`	`6`	`for _, v := range s.CriteriaItems {`
`7`	`7`	`if len(desc) > 0 {`
`@@ -10,8 +10,7 @@ func (s *SfSharingBaseCriteriaRule) getCriteria() string {`
`10`	`10`	`desc += v.Field + " " + v.Operation + " " + v.Value + v.ValueField`
`11`	`11`	`}`
`12`	`12`
`13`		`- desc += "}"`
`14`		`- return desc`
	`13`	`+ return "{" + desc + "}"`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`func (s *SfSharingCriteriaRule) ToDescription() string {`