💚 (testdata-from-ddl) fix sorting storing columns

cloudspannerecosystem · Mar 27, 2024 · 0f608ba · 0f608ba
1 parent 20dd464
commit 0f608ba
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -62,12 +62,16 @@ testdata/customtypes:
 	$(YOBIN) $(SPANNER_PROJECT_NAME) $(SPANNER_INSTANCE_NAME) $(SPANNER_DATABASE_NAME) --custom-types-file test/testdata/custom_column_types.yml --out test/testmodels/customtypes/
 
 testdata-from-ddl:
-	$(MAKE) -j4 testdata-from-ddl/default testdata-from-ddl/customtypes testdata-from-ddl/single
+	$(MAKE) -j4 testdata-from-ddl/default testdata-from-ddl/with-underscores testdata-from-ddl/customtypes testdata-from-ddl/single
 
 testdata-from-ddl/default:
 	rm -rf test/testmodels/default && mkdir -p test/testmodels/default
 	$(YOBIN) generate ./test/testdata/schema.sql --from-ddl --package models --out test/testmodels/default/
 
+testdata-from-ddl/with-underscores:
+	rm -rf test/testmodels/underscores && mkdir -p test/testmodels/underscores
+	$(YOBIN) generate ./test/testdata/schema.sql --from-ddl --package models --with-underscores --out test/testmodels/underscores/
+
 testdata-from-ddl/single:
 	rm -rf test/testmodels/single && mkdir -p test/testmodels/single
 	$(YOBIN) generate ./test/testdata/schema.sql --from-ddl --out test/testmodels/single/single_file.go --single-file

diff --git a/test/testmodels/customtypes/compositeprimarykey.yo.go b/test/testmodels/customtypes/compositeprimarykey.yo.go
diff --git a/test/testmodels/default/compositeprimarykey.yo.go b/test/testmodels/default/compositeprimarykey.yo.go
diff --git a/test/testmodels/single/single_file.go b/test/testmodels/single/single_file.go
diff --git a/test/testmodels/underscores/composite_primary_key.yo.go b/test/testmodels/underscores/composite_primary_key.yo.go