- patched e2e test cases

- removing Style logic
viant · Nov 12, 2024 · 0eca65e · 0eca65e
1 parent 6069a01
commit 0eca65e
Show file tree

Hide file tree

Showing 36 changed files with 45 additions and 36 deletions.
diff --git a/e2e/debug_gen/datly.go b/e2e/debug_gen/datly.go
@@ -66,7 +66,7 @@ func main() {
 
 	baseDir := filepath.Join(toolbox.CallerDirectory(3), "..")
 	fmt.Printf("base: %v\n", baseDir)
-	caseName := "019_generate_post_comprehensive_many"
+	caseName := "060_tabjson_comprehensive"
 	caseFolder := filepath.Join(baseDir, "local/regression/cases/", caseName)
 	gen, err := loadGen(caseFolder, caseName)
 	if err != nil {
@@ -77,7 +77,7 @@ func main() {
 		"-N=" + gen.Name,
 		"-X=" + gen.URL,
 		"-C=dev|mysql|root:dev@tcp(127.0.0.1:3306)/dev?parseTime=true",
-		"-G=post",
+		//	"-G=post",
 		"-C=dyndb|dynamodb|dynamodb://localhost:8000/us-west-1?key=dummy&secret=dummy",
 		//	fmt.Sprintf("-j='%v/local/jwt/public.enc|blowfish://default'", baseDir),
 		"-w=autogen",

diff --git a/e2e/local/regression/cases/001_one_to_many/vendor_list.dql b/e2e/local/regression/cases/001_one_to_many/vendor_list.dql
@@ -5,7 +5,8 @@
 #set( $_ = $VendorName<string>(form/name).Optional().WithPredicate(0, 'contains', 't', 'NAME'))
 #set( $_ = $Fields<[]string>(query/fields).Optional().QuerySelector('vendor'))
 #set( $_ = $Page<int>(query/page).Optional().QuerySelector('vendor'))
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.*,

diff --git a/e2e/local/regression/cases/002_uri_param/vendor_details.sql b/e2e/local/regression/cases/002_uri_param/vendor_details.sql
@@ -3,7 +3,7 @@
 
 #set( $_ = $Fields<[]string>(query/fields).Optional().QuerySelector('vendor'))
 #set( $_ = $Page<int>(query/page).Optional().QuerySelector('vendor'))
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT wrapper.* EXCEPT ID,

diff --git a/e2e/local/regression/cases/005_sumary/vendor_meta.sql b/e2e/local/regression/cases/005_sumary/vendor_meta.sql
@@ -4,7 +4,7 @@
 #set( $_ = $VendorName<string>(query/name).WithPredicate(0,'equal','t','id').Optional())
 #set( $_ = $Meta<?>(output/summary))
 #set( $_ = $Data<?>(output/view))
-#set( $_ = $Status<?>(output/status).WithTag('anonymous:"true"'))
+#set( $_ = $Status<?>(output/status).Embed())
 
 SELECT vendor.*,
        products.* EXCEPT VENDOR_ID

diff --git a/e2e/local/regression/cases/007_child_meta/child_meta.sql b/e2e/local/regression/cases/007_child_meta/child_meta.sql
@@ -2,7 +2,7 @@
 
 #set( $_ = $Meta<?>(output/summary))
 #set( $_ = $Data<?>(output/view))
-#set( $_ = $Status<?>(output/status).WithTag('anonymous:"true"'))
+#set( $_ = $Status<?>(output/status).Embed())
 
 SELECT vendor.*,
        products.* EXCEPT VENDOR_ID,

diff --git a/e2e/local/regression/cases/008_record_pagination/district_pagination.sql b/e2e/local/regression/cases/008_record_pagination/district_pagination.sql
@@ -1,7 +1,7 @@
 /* {"URI":"meta/districts"} */
 
 #set( $_ = $Page<int>(query/page).Optional().QuerySelector('districts'))
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT districts.*,

diff --git a/e2e/local/regression/cases/009_apikey/vendor_apikey.sql b/e2e/local/regression/cases/009_apikey/vendor_apikey.sql
@@ -9,7 +9,7 @@
 } */
 
 #set( $_ = $Page<int>(query/page).Optional().QuerySelector('vendor'))
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.*,

diff --git a/e2e/local/regression/cases/010_codecs/vendors_codec.sql b/e2e/local/regression/cases/010_codecs/vendors_codec.sql
@@ -1,6 +1,6 @@
 /* {"URI":"vendors-codec/"} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT vendor.*
 FROM (SELECT * FROM VENDOR t WHERE t.ID IN ($vendorIDs) ) vendor
diff --git a/e2e/local/regression/cases/011_env/environment.sql b/e2e/local/regression/cases/011_env/environment.sql
@@ -1,6 +1,6 @@
 /* { "URI":"vendors-env/", "Const": { "Vendor": "VENDOR", "Product": "PRODUCT" } } */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT vendor.*,
        products.*

diff --git a/e2e/local/regression/cases/012_meta_format/meta_format.sql b/e2e/local/regression/cases/012_meta_format/meta_format.sql
@@ -2,7 +2,7 @@
 
 #set( $_ = $Meta<?>(output/summary))
 #set( $_ = $Data<?>(output/view))
-#set( $_ = $Status<?>(output/status).WithTag('anonymous:"true"'))
+#set( $_ = $Status<?>(output/status).Embed())
 
 SELECT vendor.*,
        products.* EXCEPT VENDOR_ID,

diff --git a/e2e/local/regression/cases/013_col_in/vendor_col_in.sql b/e2e/local/regression/cases/013_col_in/vendor_col_in.sql
@@ -7,7 +7,7 @@
     }
  } */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.*,

diff --git a/e2e/local/regression/cases/014_header_params/header_vendors.sql b/e2e/local/regression/cases/014_header_params/header_vendors.sql
@@ -1,6 +1,6 @@
 /* {"URI":"headers/vendors"} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT vendor.*,
        products.* EXCEPT VENDOR_ID

diff --git a/e2e/local/regression/cases/038_mysql_boolean/user_metadata.sql b/e2e/local/regression/cases/038_mysql_boolean/user_metadata.sql
@@ -3,7 +3,7 @@
 #set( $_ = $Fields<[]string>(query/fields).Optional().QuerySelector('user_metadata'))
 #set( $_ = $Page<int>(query/page).Optional().QuerySelector('user_metadata'))
 
-#set( $_ = $UserMetadata<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $UserMetadata<?>(output/view).Embed())
 
 
 SELECT user_metadata.*

diff --git a/e2e/local/regression/cases/040_parameters_order/parameters_order.sql b/e2e/local/regression/cases/040_parameters_order/parameters_order.sql
@@ -8,7 +8,7 @@ import (
 
 
 #set($_ = $Data<*Events>(body/Data).Output())
-#set($_ = $Status<?>(output/status).WithTag('anonymous:"true"'))
+#set($_ = $Status<?>(output/status).Embed())
 
 #set($_ = $Events<*Events>(body/Data))
 #set($_ = $Jwt<string>(Header/Authorization).WithCodec(JwtClaim).WithStatusCode(401))

diff --git a/e2e/local/regression/cases/042_json_codec/json_codec.sql b/e2e/local/regression/cases/042_json_codec/json_codec.sql
@@ -7,7 +7,7 @@ import (
 	"regression/cases/042_json_codec.Record"
 )
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.*,

diff --git a/e2e/local/regression/cases/043_json_codec_single/json_codec_single.sql b/e2e/local/regression/cases/043_json_codec_single/json_codec_single.sql
@@ -7,7 +7,7 @@ import (
 	"regression/cases/043_json_codec_single.Record"
 )
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.* EXCEPT(Id),

diff --git a/e2e/local/regression/cases/044_inline_json_codec/inlinejson_codec.sql b/e2e/local/regression/cases/044_inline_json_codec/inlinejson_codec.sql
@@ -7,7 +7,7 @@ import (
 	"regression/cases/044_inline_json_codec.Record"
 )
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.*,

diff --git a/e2e/local/regression/cases/045_raw_json/raw_json.sql b/e2e/local/regression/cases/045_raw_json/raw_json.sql
@@ -4,7 +4,7 @@ import (
 	"regression/cases/045_raw_json.Record"
 )
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.*,

diff --git a/e2e/local/regression/cases/046_raw_json_expr/raw_json_tag.sql b/e2e/local/regression/cases/046_raw_json_expr/raw_json_tag.sql
@@ -1,6 +1,6 @@
 /* {"URI":"raw_json_tag"} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.*

diff --git a/e2e/local/regression/cases/047_raw_json_tag/raw_json_expr.sql b/e2e/local/regression/cases/047_raw_json_tag/raw_json_expr.sql
@@ -1,6 +1,6 @@
 /* {"URI":"raw_json_expr"} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.*,

diff --git a/e2e/local/regression/cases/049_oauth_hmac/vendor_hauth.sql b/e2e/local/regression/cases/049_oauth_hmac/vendor_hauth.sql
@@ -1,7 +1,7 @@
 /* {"URI":"hauth/vendors/{vendorID}"} */
 
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 #set($_ = $Jwt<string>(Header/Authorization).WithCodec(JwtClaim).WithStatusCode(401))
 #set($_ = $Authorization  /*
    !!403 SELECT Authorized /* {"DataType":"bool"} */

diff --git a/e2e/local/regression/cases/055_variables/vars.sql b/e2e/local/regression/cases/055_variables/vars.sql
@@ -5,7 +5,7 @@
 }
  */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT main.*

diff --git a/e2e/local/regression/cases/058_tabjson_one_to_many/tabular_vendor_list.sql b/e2e/local/regression/cases/058_tabjson_one_to_many/tabular_vendor_list.sql
@@ -1,6 +1,6 @@
 /* {"URI":"tabular/basic/vendors/", "DataFormat":"tabular", "TabularJSON":{"FloatPrecision":"20"}} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT vendor.* EXCEPT CREATED,UPDATED,
        products.* EXCEPT VENDOR_ID,CREATED,UPDATED

diff --git a/e2e/local/regression/cases/059_tabjson_basic/bar_list.sql b/e2e/local/regression/cases/059_tabjson_basic/bar_list.sql
@@ -1,6 +1,6 @@
 /* {"URI":"basic/bars/", "DataFormat":"tabular", "TabularJSON":{"FloatPrecision":"8"}} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT bar.*
 FROM (SELECT * FROM BAR t ) bar
diff --git a/e2e/local/regression/cases/060_tabjson_comprehensive/bar_comprehensive_list.sql b/e2e/local/regression/cases/060_tabjson_comprehensive/bar_comprehensive_list.sql
@@ -1,8 +1,7 @@
 /* {"URI":"comprehensive/bars/", "DataFormat":"tabular", "TabularJSON":{"FloatPrecision":"-1"}} */
 
 
-#set( $_ = $Data<?>(output/view).Cardinality('One').WithTag('anonymous:"true"'))
-
+#set( $_ = $Data<?>(output/view).Cardinality('Many'))
 
 SELECT bar.*
 FROM (SELECT * FROM BAR t ) bar
diff --git a/e2e/local/regression/cases/062_predicates/vendors_predicate.sql b/e2e/local/regression/cases/062_predicates/vendors_predicate.sql
@@ -4,7 +4,7 @@
 #set($_ = $UserCreated<int>(query/UserCreated).WithPredicate(0, "equal", "t", "USER_CREATED").Optional())
 #set($_ = $Name<string>(query/Name).WithPredicate(1, "equal", "t", "NAME").Optional())
 #set($_ = $AccountID<int>(query/AccountID).WithPredicate(1, "equal", "t", "ACCOUNT_ID").Optional())
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.*

diff --git a/e2e/local/regression/cases/063_external_parameters/external_parameters.sql b/e2e/local/regression/cases/063_external_parameters/external_parameters.sql
@@ -5,7 +5,7 @@
    } */
 
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.*

diff --git a/e2e/local/regression/cases/064_params_group/params_group.sql b/e2e/local/regression/cases/064_params_group/params_group.sql
@@ -13,7 +13,7 @@
 #set($_ = $IDMin<int>(query/idMin).Of('IDRange').WithTag('velty:"names=IDMin|ValueMin"').Optional())
 #set($_ = $IDMax<int>(query/idMax).Of('IDRange').WithTag('velty:"names=IDMax|ValueMax"').Optional())
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT bar.*

diff --git a/e2e/local/regression/cases/065_encode_struct/encode_struct.sql b/e2e/local/regression/cases/065_encode_struct/encode_struct.sql
@@ -5,7 +5,7 @@ import (
 )
 
 #set($_ = $IDs<[]string>(query/ids).WithCodec("Encode", "*VendorIds", "/" , "ID", "AccountID", "UserCreated").WithPredicate(0, "multi_in", "t"))
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT vendor.*
 FROM (

diff --git a/e2e/local/regression/cases/066_xls_output/vendor_xls.sql b/e2e/local/regression/cases/066_xls_output/vendor_xls.sql
@@ -1,6 +1,6 @@
 /* {"URI":"vendors/xls/", "DataFormat":"xls"} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.*,

diff --git a/e2e/local/regression/cases/067_xml_basic/xml_bar_list.sql b/e2e/local/regression/cases/067_xml_basic/xml_bar_list.sql
@@ -1,7 +1,7 @@
 /* {"URI":"xml/basic/bars/", "DataFormat":"xml", "XML":{"FloatPrecision":"8"}} */
 
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT bar.*

diff --git a/e2e/local/regression/cases/068_xml_one_to_many/xml_tabular_vendor_list.sql b/e2e/local/regression/cases/068_xml_one_to_many/xml_tabular_vendor_list.sql
@@ -1,6 +1,6 @@
 /* {"URI":"xml/basic/vendors/", "DataFormat":"xml", "XML":{"FloatPrecision":"20"}} */
 
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 
 SELECT vendor.* EXCEPT CREATED,UPDATED,

diff --git a/e2e/local/regression/cases/069_encode_struct_pkg/encode_struct_pkg.sql b/e2e/local/regression/cases/069_encode_struct_pkg/encode_struct_pkg.sql
@@ -5,7 +5,7 @@ import (
 )
 
 #set($_ = $IDs<[]string>(query/ids).WithCodec("Encode", "*encode_struct_pkg.VendorIds", "/" , "ID", "AccountID", "UserCreated").WithPredicate(0, "multi_in", "t"))
-#set( $_ = $Data<?>(output/view).WithTag('anonymous:"true"'))
+#set( $_ = $Data<?>(output/view).Embed())
 
 SELECT vendor.*
 FROM (

diff --git a/e2e/local/regression/regression.yaml b/e2e/local/regression/regression.yaml
@@ -30,7 +30,7 @@ pipeline:
         '[]gen': '@gen'
 
       subPath: 'cases/${index}_*'
-      range: 1..069
+      range: 60..060
       template:
         checkSkip:
           action: nop

diff --git a/internal/translator/discovery.go b/internal/translator/discovery.go
@@ -61,6 +61,13 @@ func (s *Service) detectComponentViewType(viewColumns discover.Columns, resource
 	if root.View.View.Schema == nil {
 		root.View.View.Schema = &state.Schema{Cardinality: state.Many}
 	}
+
+	if dataParameter := resource.OutputState.Parameters().LookupByLocation(state.KindOutput, "view"); dataParameter != nil {
+		if dataParameter.Schema != nil && dataParameter.Schema.Cardinality != "" {
+			root.View.Schema.Cardinality = dataParameter.Schema.Cardinality
+		}
+	}
+
 	if root.View.Schema.Cardinality == "" {
 		root.View.Schema.Cardinality = state.Many
 	}

diff --git a/internal/translator/parser/declarations.go b/internal/translator/parser/declarations.go
@@ -245,6 +245,8 @@ func (s *Declarations) parseShorthands(declaration *Declaration, cursor *parsly.
 		content = content[1 : len(content)-1]
 		args := extractArgs(content)
 		switch text {
+		case "Embed":
+			declaration.Tag += ` anonymous:"true"`
 		case "WithTag", "Tag":
 			if len(args) != 1 {
 				return fmt.Errorf("expected WithTag to have one args, but got %v", len(args))