sqlc.embed: skip object if id is None

simo7 · simo7 · commit eaae4615626a · 2024-10-06T19:47:38.000+02:00
diff --git a/internal/config.go b/internal/config.go
@@ -9,7 +9,10 @@ type Config struct {
 	InflectionExcludeTableNames []string `json:"inflection_exclude_table_names"`
 	TablePrefix                 string   `json:"table_prefix"`
 	// When a query uses a table with RLS enforced fields, it will be required to
-	// parametrized those fields. Associate tables are not covered!
+	// parametrized those fields. Not covered:
+	// 	- Associate tables
+	// 	- sqlc.embed()
+	// 	- json_agg(tbl.*)
 	RLSEnforcedFields []string `json:"rls_enforced_fields"`
 	// Merge queries defined in different files into one output queries.py file
 	MergeQueryFiles bool `json:"merge_query_files"`
diff --git a/internal/gen.go b/internal/gen.go
@@ -118,27 +118,33 @@ func (v QueryValue) RowNode(rowVar string) *pyast.Node {
 			var embedFields []*pyast.Keyword
 			for _, embed := range f.EmbedFields {
 				embedFields = append(embedFields, &pyast.Keyword{
-					Arg: embed.Name,
-					Value: subscriptNode(
-						rowVar,
-						constantInt(idx),
-					),
+					Arg:   embed.Name,
+					Value: subscriptNode(rowVar, constantInt(idx)),
 				})
 				idx++
 			}
 			val = &pyast.Node{
-				Node: &pyast.Node_Call{
-					Call: &pyast.Call{
-						Func:     f.Type.Annotation(false),
-						Keywords: embedFields,
+				Node: &pyast.Node_Compare{
+					Compare: &pyast.Compare{
+						Left: &pyast.Node{
+							Node: &pyast.Node_Call{
+								Call: &pyast.Call{
+									Func:     f.Type.Annotation(false),
+									Keywords: embedFields,
+								},
+							},
+						},
+						Ops: []*pyast.Node{
+							poet.Name(fmt.Sprintf("if row[%d] else", idx-len(f.EmbedFields))),
+						},
+						Comparators: []*pyast.Node{
+							poet.Constant(nil),
+						},
 					},
 				},
 			}
 		} else {
-			val = subscriptNode(
-				rowVar,
-				constantInt(idx),
-			)
+			val = subscriptNode(rowVar, constantInt(idx))
 			idx++
 		}
 		call.Keywords = append(call.Keywords, &pyast.Keyword{
