fix: also quote reserved identifiers for insert / update

Author: hlubek

builder/insert_builder.go

@@ -278,7 +278,7 @@ func (b InsertBuilder) innerWriteSQL(sb *SQLBuilder) {
 					sb.WriteRune(' ')
 				}
 			}
-			sb.WriteString(columnName)
+			sb.WriteString(quoteIdentifierIfKeyword(columnName))
 		}
 		sb.WriteString(")")
 	}
@@ -362,7 +362,7 @@ func (b InsertBuilder) innerWriteSQL(sb *SQLBuilder) {
 					if i > 0 {
 						sb.WriteString(",")
 					}
-					sb.WriteString(item.columnName)
+					sb.WriteString(quoteIdentifierIfKeyword(item.columnName))
 					sb.WriteString(" = ")
 					item.value.WriteSQL(sb)
 				}

builder/update_builder.go

@@ -175,7 +175,7 @@ func (b UpdateBuilder) innerWriteSQL(sb *SQLBuilder) {
 		if i > 0 {
 			sb.WriteString(",")
 		}
-		sb.WriteString(setItem.columnName)
+		sb.WriteString(quoteIdentifierIfKeyword(setItem.columnName))
 		sb.WriteString(" = ")
 		setItem.value.WriteSQL(sb)
 	}

insert_builder_test.go

@@ -340,6 +340,27 @@ WHERE d.zipcode <> '21201'`,
 		)
 	})
 
+	t.Run("set map with reserved keywords", func(t *testing.T) {
+		q := qrb.
+			InsertInto(qrb.N("events")).
+			SetMap(map[string]any{
+				"event_id": "123",
+				"from":     "2021-01-01",
+				"to":       "2021-01-02",
+				"user":     "john",
+			})
+
+		testhelper.AssertSQLWriterEquals(
+			t,
+			`
+			INSERT INTO events (event_id,"from","to","user") VALUES
+				($1, $2, $3, $4)
+			`,
+			[]any{"123", "2021-01-01", "2021-01-02", "john"},
+			q,
+		)
+	})
+
 	t.Run("values with args", func(t *testing.T) {
 		q := qrb.
 			InsertInto(qrb.N("films")).

update_builder_test.go

@@ -130,13 +130,32 @@ func TestUpdateBuilder(t *testing.T) {
 		testhelper.AssertSQLWriterEquals(
 			t,
 			`
-			UPDATE films SET code = $1, kind = $2 WHERE kind = 'Drama'	
+			UPDATE films SET code = $1, kind = $2 WHERE kind = 'Drama'
 			`,
 			[]any{"UA502", "Comedy"},
 			q,
 		)
 	})
 
+	t.Run("set map with reserved keywords", func(t *testing.T) {
+		q := qrb.
+			Update(qrb.N("events")).
+			SetMap(map[string]any{
+				"from": "2021-01-01",
+				"to":   "2021-01-02",
+			}).
+			Where(qrb.N("event_id").Eq(qrb.String("123")))
+
+		testhelper.AssertSQLWriterEquals(
+			t,
+			`
+			UPDATE events SET "from" = $1, "to" = $2 WHERE event_id = '123'
+			`,
+			[]any{"2021-01-01", "2021-01-02"},
+			q,
+		)
+	})
+
 	t.Run("apply if", func(t *testing.T) {
 		q := qrb.
 			Update(qrb.N("films")).