allow nil values for properties

putdotio · Sep 7, 2018 · f259acf · f259acf
1 parent 3bc0ef1
commit f259acf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/internal/inserter/eventinserter/eventinserter.go b/internal/inserter/eventinserter/eventinserter.go
@@ -38,11 +38,15 @@ func (i EventInserter) InsertSQL(def property.Types, t time.Time) (string, []int
 		}
 		sb.WriteRune(',')
 		sb.WriteString(string(pname))
-		val, err := ptype.ConvertValue(pval)
-		if err != nil {
-			return "", nil, errors.New("cannot read property (" + string(pname) + "): " + err.Error())
+		if pval != nil {
+			val, err := ptype.ConvertValue(pval)
+			if err != nil {
+				return "", nil, errors.New("cannot read property (" + string(pname) + "): " + err.Error())
+			}
+			values = append(values, val)
+		} else {
+			values = append(values, nil)
 		}
-		values = append(values, val)
 	}
 	sb.WriteString(") values (?, ?, ?")
 	for range e.Properties {

diff --git a/internal/inserter/userinserter/userinserter.go b/internal/inserter/userinserter/userinserter.go
@@ -32,11 +32,15 @@ func (i UserInserter) InsertSQL(def property.Types, t time.Time) (string, []inte
 		}
 		sb.WriteRune(',')
 		sb.WriteString(string(pname))
-		val, err := ptype.ConvertValue(pval)
-		if err != nil {
-			return "", nil, errors.New("cannot read property (" + string(pname) + "): " + err.Error())
+		if pval != nil {
+			val, err := ptype.ConvertValue(pval)
+			if err != nil {
+				return "", nil, errors.New("cannot read property (" + string(pname) + "): " + err.Error())
+			}
+			values = append(values, val)
+		} else {
+			values = append(values, nil)
 		}
-		values = append(values, val)
 	}
 	sb.WriteString(") values (?, ?")
 	for range u.Properties {
@@ -48,11 +52,15 @@ func (i UserInserter) InsertSQL(def property.Types, t time.Time) (string, []inte
 		sb.WriteRune(',')
 		sb.WriteString(string(pname))
 		sb.WriteString("=?")
-		val, err := def[pname].ConvertValue(pval)
-		if err != nil {
-			return "", nil, err
+		if pval != nil {
+			val, err := def[pname].ConvertValue(pval)
+			if err != nil {
+				return "", nil, err
+			}
+			values = append(values, val)
+		} else {
+			values = append(values, nil)
 		}
-		values = append(values, val)
 	}
 	return sb.String(), values, nil
 }