Merge branch 'main' into issue-21-parameter-name

EURODEO · Feb 20, 2024 · 075223a · 075223a · github-actions · Feb 20, 2024
2 parents d98d690 + 53ac5d6
commit 075223a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/datastore/datastore/storagebackend/postgresql/gettsattrgroups.go b/datastore/datastore/storagebackend/postgresql/gettsattrgroups.go
@@ -79,12 +79,11 @@ func getTSMdata(colVals map[string]interface{}) (*datastore.TSMetadata, error) {
 		switch field.Kind() {
 		case reflect.String:
 			val0, ok := val.(string)
-			if !ok {
-				return nil, fmt.Errorf(
-					"value not string: %v (type: %T; goName: %s, pbName: %s",
-					val, val, goName, pbName)
+			if ok { // NOTE: !ok in this case would typically mean a nil value resulting from a
+				// NULL in the corresponding database column
+				field.SetString(val0)
 			}
-			field.SetString(val0)
+
 		default:
 			return nil, fmt.Errorf(
 				"unsupported type: %v (val: %v; type: %T; goName: %s; pbName: %s)",

diff --git a/protobuf/datastore.proto b/protobuf/datastore.proto
@@ -102,7 +102,7 @@ message TSMetadata {
   string level = 24;
   string period = 25;
   string function = 26;
-  string parameter_name = 27;
+  string parameter_name = 27 [json_name = "parameter_name"];
   // --- END string metadata -----------------
 }
File	Stmts	Miss	Cover	Missing
\_\_init\_\_.py	0	0	100%
datastore_pb2.py	58	46	21%	24–69
datastore_pb2_grpc.py	43	23	47%	37–52, 85–87, 92–94, 99–101, 106–108, 112–136, 174, 191, 208, 225
dependencies.py	49	36	27%	16–53, 63–71, 79–86
grpc_getter.py	13	8	38%	12–16, 20–24
locustfile.py	15	15	0%	1–31
main.py	22	3	86%	27, 37, 47
metadata_endpoints.py	20	4	80%	17, 34–67, 71
formatters
\_\_init\_\_.py	7	0	100%
covjson.py	46	27	41%	26–76, 82–91
routers
\_\_init\_\_.py	0	0	100%
edr.py	71	43	39%	37–60, 77–90, 105–120, 135–161
records.py	0	0	100%
TOTAL	344	205	40%