Merge pull request #36 from blastrain/feature/fix-build-in-query-values

Call builer.Build in building SQL

Author: kanataxa

query_builder.go

@@ -600,7 +600,8 @@ func (b *QueryBuilder) indexes() []string {
 	return sortedIndexes
 }
 
-func (b *QueryBuilder) SelectSQL(typ *Struct) (string, []interface{}) {
+func (b *QueryBuilder) SelectSQL(factory *ValueFactory, typ *Struct) (string, []interface{}) {
+	b.Build(factory)
 	where := []string{}
 	args := []interface{}{}
 	for _, condition := range b.conditions.conditions {
@@ -623,7 +624,8 @@ func (b *QueryBuilder) SelectSQL(typ *Struct) (string, []interface{}) {
 	), args
 }
 
-func (b *QueryBuilder) UpdateSQL(updateMap map[string]interface{}) (string, []interface{}) {
+func (b *QueryBuilder) UpdateSQL(factory *ValueFactory, updateMap map[string]interface{}) (string, []interface{}) {
+	b.Build(factory)
 	where := []string{}
 	args := []interface{}{}
 	for _, condition := range b.conditions.conditions {
@@ -640,7 +642,8 @@ func (b *QueryBuilder) UpdateSQL(updateMap map[string]interface{}) (string, []in
 	return fmt.Sprintf("UPDATE `%s` SET %s WHERE %s", b.tableName, strings.Join(setList, ","), strings.Join(where, " AND ")), values
 }
 
-func (b *QueryBuilder) DeleteSQL() (string, []interface{}) {
+func (b *QueryBuilder) DeleteSQL(factory *ValueFactory) (string, []interface{}) {
+	b.Build(factory)
 	where := []string{}
 	args := []interface{}{}
 	for _, condition := range b.conditions.conditions {

second_level_cache.go

@@ -968,7 +968,7 @@ func (c *SecondLevelCache) UpdateByQueryBuilder(ctx context.Context, tx *Tx, bui
 		}
 		foundValues = values
 	} else {
-		sql, args := builder.SelectSQL(c.typ)
+		sql, args := builder.SelectSQL(c.valueFactory, c.typ)
 		rows, err := tx.conn.QueryContext(ctx, sql, args...)
 		if err != nil {
 			return xerrors.Errorf("failed sql %s %v: %w", sql, args, err)
@@ -989,7 +989,7 @@ func (c *SecondLevelCache) UpdateByQueryBuilder(ctx context.Context, tx *Tx, bui
 			log.GetFromDB(tx.id, sql, "", value)
 		}
 	}
-	sql, values := builder.UpdateSQL(updateMap)
+	sql, values := builder.UpdateSQL(c.valueFactory, updateMap)
 	if _, err := tx.conn.ExecContext(ctx, sql, values...); err != nil {
 		return xerrors.Errorf("failed update sql %s %v: %w", sql, values, err)
 	}
@@ -1297,7 +1297,8 @@ func (c *SecondLevelCache) isUsedPrimaryKeyBuilder(queries *Queries) bool {
 }
 
 func (c *SecondLevelCache) deleteCacheFromSQL(ctx context.Context, tx *Tx, builder *QueryBuilder) (e error) {
-	sql, args := builder.SelectSQL(c.typ)
+	sql, args := builder.SelectSQL(c.valueFactory, c.typ)
+
 	rows, err := tx.conn.QueryContext(ctx, sql, args...)
 	if err != nil {
 		return xerrors.Errorf("failed sql %s %v: %w", sql, args, err)
@@ -1332,7 +1333,7 @@ func (c *SecondLevelCache) DeleteByQueryBuilder(ctx context.Context, tx *Tx, bui
 				return xerrors.Errorf("failed to delete cache by SQL: %w", err)
 			}
 		}
-		sql, args := builder.DeleteSQL()
+		sql, args := builder.DeleteSQL(c.valueFactory)
 		if _, err := tx.conn.ExecContext(ctx, sql, args...); err != nil {
 			return xerrors.Errorf("failed sql %s %v: %w", sql, args, err)
 		}
@@ -1355,7 +1356,7 @@ func (c *SecondLevelCache) DeleteByQueryBuilder(ctx context.Context, tx *Tx, bui
 			}
 		}
 	}
-	sql, args := builder.DeleteSQL()
+	sql, args := builder.DeleteSQL(c.valueFactory)
 	if _, err := tx.conn.ExecContext(ctx, sql, args...); err != nil {
 		return xerrors.Errorf("failed sql %s %v: %w", sql, args, err)
 	}
@@ -1409,7 +1410,7 @@ func (c *SecondLevelCache) deleteKeyByValue(tx *Tx, value *StructValue) error {
 }
 
 func (c *SecondLevelCache) findValuesByQueryBuilderWithoutCache(ctx context.Context, tx *Tx, builder *QueryBuilder) (ssv *StructSliceValue, e error) {
-	sql, args := builder.SelectSQL(c.typ)
+	sql, args := builder.SelectSQL(c.valueFactory, c.typ)
 	rows, err := tx.conn.QueryContext(ctx, sql, args...)
 	if err != nil {
 		return nil, xerrors.Errorf("failed sql %s %v: %w", sql, args, err)

tx_test.go

@@ -477,7 +477,7 @@ func TestTx_FindByQueryBuilderContext(t *testing.T) {
 		tx, err := cache.Begin(conn)
 		NoError(t, err)
 		defer func() { NoError(t, tx.RollbackUnlessCommitted()) }()
-		builder := NewQueryBuilder("user_logs").Eq("id", uint64(1)).Gte("content_id", uint64(1)).Lte("content_id", uint64(1))
+		builder := NewQueryBuilder("user_logs").In("id", []uint64{1}).Gte("content_id", uint64(1)).Lte("content_id", uint64(1))
 		var userLogs UserLogs
 		NoError(t, tx.FindByQueryBuilderContext(context.Background(), builder, &userLogs))
 		NoError(t, tx.Commit())