🍹 🥂 🌮 (cache_plan) condition/update target に placeholder プロパティを入れた

Author: cp-20

README.md

@@ -49,10 +49,15 @@ type Format = {
 
 type Query = SelectQuery | UpdateQuery | DeleteQuery | InsertQuery
 
+type Placeholder = {
+  index: number;
+  extra?: boolean
+}
+
 type Condition = {
   column: string
-  value?: number | string
   operator: 'eq' | 'in'
+  placeholder: Placeholder
 }
 
 type SelectQuery = CachableSelectQuery | NonCachableSelectQuery
@@ -63,8 +68,6 @@ type CachableSelectQuery = {
   cache: true
   table: string
   targets: string[]
-  // ?の位置と一致するような順番
-  // 固定値でWHEREしている場合は最後に
   conditions: Condition[]
   orders: {
     column: string

domains/cache_plan.go

@@ -26,10 +26,15 @@ const (
 	CachePlanQueryType_INSERT CachePlanQueryType = "insert"
 )
 
+type CachePlanPlaceholder struct {
+	Index int  `yaml:"index"`
+	Extra bool `yaml:"extra,omitempty"`
+}
+
 type CachePlanCondition struct {
-	Column   string                `yaml:"column"`
-	Value    interface{}           `yaml:"value,omitempty"`
-	Operator CachePlanOperatorEnum `yaml:"operator,omitempty"`
+	Column      string                `yaml:"column"`
+	Operator    CachePlanOperatorEnum `yaml:"operator,omitempty"`
+	Placeholder CachePlanPlaceholder  `yaml:"placeholder"`
 }
 
 type CachePlanOperatorEnum string
@@ -59,10 +64,15 @@ type CachePlanSelectQuery struct {
 	Orders     []CachePlanOrder     `yaml:"orders,omitempty"`
 }
 
+type CachePlanUpdateTarget struct {
+	Column      string               `yaml:"column"`
+	Placeholder CachePlanPlaceholder `yaml:"placeholder"`
+}
+
 type CachePlanUpdateQuery struct {
-	Table      string               `yaml:"table"`
-	Targets    []string             `yaml:"targets"`
-	Conditions []CachePlanCondition `yaml:"conditions,omitempty"`
+	Table      string                  `yaml:"table"`
+	Targets    []CachePlanUpdateTarget `yaml:"targets"`
+	Conditions []CachePlanCondition    `yaml:"conditions,omitempty"`
 }
 
 type CachePlanDeleteQuery struct {

domains/cache_plan_repository_test.go

@@ -22,6 +22,8 @@ var formatted = `queries:
     conditions:
       - column: livestream_id
         operator: eq
+        placeholder:
+          index: 0
     orders:
       - column: created_at
         order: desc
@@ -37,31 +39,45 @@ var formatted = `queries:
     conditions:
       - column: livestream_id
         operator: eq
+        placeholder:
+          index: 0
   - query: DELETE FROM livecomments WHERE id = ? AND livestream_id = ? AND (SELECT COUNT(*) FROM (SELECT ? AS text) AS texts INNER JOIN (SELECT CONCAT('%', ?, '%') AS pattern) AS patterns ON texts.text LIKE patterns.pattern) >= 1;
     type: delete
     table: livecomments
     conditions:
       - column: id
         operator: eq
+        placeholder:
+          index: 0
       - column: livestream_id
         operator: eq
+        placeholder:
+          index: 1
   - query: DELETE FROM livestream_viewers_history WHERE user_id = ? AND livestream_id = ?
     type: delete
     table: livestream_viewers_history
     conditions:
       - column: user_id
         operator: eq
+        placeholder:
+          index: 0
       - column: livestream_id
         operator: eq
-  - query: UPDATE settings SET value = ? WHERE name = 'payment_gateway_url'
+        placeholder:
+          index: 1
+  - query: UPDATE settings SET value = ? WHERE name = ?
     type: update
     table: settings
     targets:
-      - value
+      - column: value
+        placeholder:
+          index: 0
     conditions:
       - column: name
-        value: payment_gateway_url
         operator: eq
+        placeholder:
+          index: 0
+          extra: true
 `
 
 var parsed = &CachePlan{
@@ -72,11 +88,15 @@ var parsed = &CachePlan{
 				Query: "SELECT * FROM livecomments WHERE livestream_id = ? ORDER BY created_at DESC",
 			},
 			Select: &CachePlanSelectQuery{
-				Table:      "livecomments",
-				Cache:      true,
-				Targets:    []string{"id", "user_id", "livestream_id", "comment", "tip", "created_at"},
-				Conditions: []CachePlanCondition{{Column: "livestream_id", Operator: CachePlanOperator_EQ}},
-				Orders:     []CachePlanOrder{{Column: "created_at", Order: "desc"}},
+				Table:   "livecomments",
+				Cache:   true,
+				Targets: []string{"id", "user_id", "livestream_id", "comment", "tip", "created_at"},
+				Conditions: []CachePlanCondition{
+					{Column: "livestream_id", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 0}},
+				},
+				Orders: []CachePlanOrder{
+					{Column: "created_at", Order: "desc"},
+				},
 			},
 		},
 		{
@@ -94,10 +114,12 @@ var parsed = &CachePlan{
 				Type:  CachePlanQueryType_SELECT,
 			},
 			Select: &CachePlanSelectQuery{
-				Table:      "livestream_viewers_history",
-				Cache:      true,
-				Targets:    []string{"COUNT()"},
-				Conditions: []CachePlanCondition{{Column: "livestream_id", Operator: CachePlanOperator_EQ}},
+				Table:   "livestream_viewers_history",
+				Cache:   true,
+				Targets: []string{"COUNT()"},
+				Conditions: []CachePlanCondition{
+					{Column: "livestream_id", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 0}},
+				},
 			},
 		},
 		{
@@ -106,8 +128,11 @@ var parsed = &CachePlan{
 				Type:  CachePlanQueryType_DELETE,
 			},
 			Delete: &CachePlanDeleteQuery{
-				Table:      "livecomments",
-				Conditions: []CachePlanCondition{{Column: "id", Operator: CachePlanOperator_EQ}, {Column: "livestream_id", Operator: CachePlanOperator_EQ}},
+				Table: "livecomments",
+				Conditions: []CachePlanCondition{
+					{Column: "id", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 0}},
+					{Column: "livestream_id", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 1}},
+				},
 			},
 		},
 		{
@@ -116,19 +141,26 @@ var parsed = &CachePlan{
 				Type:  CachePlanQueryType_DELETE,
 			},
 			Delete: &CachePlanDeleteQuery{
-				Table:      "livestream_viewers_history",
-				Conditions: []CachePlanCondition{{Column: "user_id", Operator: CachePlanOperator_EQ}, {Column: "livestream_id", Operator: CachePlanOperator_EQ}},
+				Table: "livestream_viewers_history",
+				Conditions: []CachePlanCondition{
+					{Column: "user_id", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 0}},
+					{Column: "livestream_id", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 1}},
+				},
 			},
 		},
 		{
 			CachePlanQueryBase: &CachePlanQueryBase{
-				Query: "UPDATE settings SET value = ? WHERE name = 'payment_gateway_url'",
+				Query: "UPDATE settings SET value = ? WHERE name = ?",
 				Type:  CachePlanQueryType_UPDATE,
 			},
 			Update: &CachePlanUpdateQuery{
-				Table:      "settings",
-				Targets:    []string{"value"},
-				Conditions: []CachePlanCondition{{Column: "name", Value: "payment_gateway_url", Operator: CachePlanOperator_EQ}},
+				Table: "settings",
+				Targets: []CachePlanUpdateTarget{
+					{Column: "value", Placeholder: CachePlanPlaceholder{Index: 0}},
+				},
+				Conditions: []CachePlanCondition{
+					{Column: "name", Operator: CachePlanOperator_EQ, Placeholder: CachePlanPlaceholder{Index: 0, Extra: true}},
+				},
 			},
 		},
 	},