pixeldrain/gocqlx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Change tuple-element parameter names to name[idx]

Browse Source
This commit is contained in:
Drahflow
2022-02-16 16:50:09 +01:00
committed by Michal Jan Matczuk
parent 58908485da
commit 8054b9d47b
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
qb/cmp_test.go
View File

@@ -31,7 +31,7 @@ func TestCmp(t *testing.T) {
{ {
C: NeTuple("ne", 3), C: NeTuple("ne", 3),
S: "ne!=(?,?,?)", S: "ne!=(?,?,?)",
N: []string{"ne_0", "ne_1", "ne_2"}, N: []string{"ne[0]", "ne[1]", "ne[2]"},
}, },
{ {
C: Lt("lt"), C: Lt("lt"),
@@ -41,7 +41,7 @@ func TestCmp(t *testing.T) {
{ {
C: LtTuple("lt", 2), C: LtTuple("lt", 2),
S: "lt<(?,?)", S: "lt<(?,?)",
N: []string{"lt_0", "lt_1"}, N: []string{"lt[0]", "lt[1]"},
}, },
{ {
C: LtOrEq("lt"), C: LtOrEq("lt"),
@@ -51,7 +51,7 @@ func TestCmp(t *testing.T) {
{ {
C: LtOrEqTuple("lt", 2), C: LtOrEqTuple("lt", 2),
S: "lt<=(?,?)", S: "lt<=(?,?)",
N: []string{"lt_0", "lt_1"}, N: []string{"lt[0]", "lt[1]"},
}, },
{ {
C: Gt("gt"), C: Gt("gt"),
@@ -61,7 +61,7 @@ func TestCmp(t *testing.T) {
{ {
C: GtTuple("gt", 2), C: GtTuple("gt", 2),
S: "gt>(?,?)", S: "gt>(?,?)",
N: []string{"gt_0", "gt_1"}, N: []string{"gt[0]", "gt[1]"},
}, },
{ {
C: GtOrEq("gt"), C: GtOrEq("gt"),
@@ -71,7 +71,7 @@ func TestCmp(t *testing.T) {
{ {
C: GtOrEqTuple("gt", 2), C: GtOrEqTuple("gt", 2),
S: "gt>=(?,?)", S: "gt>=(?,?)",
N: []string{"gt_0", "gt_1"}, N: []string{"gt[0]", "gt[1]"},
}, },
{ {
C: In("in"), C: In("in"),
@@ -81,7 +81,7 @@ func TestCmp(t *testing.T) {
{ {
C: InTuple("in", 2), C: InTuple("in", 2),
S: "in IN (?,?)", S: "in IN (?,?)",
N: []string{"in_0", "in_1"}, N: []string{"in[0]", "in[1]"},
}, },
{ {
C: Contains("cnt"), C: Contains("cnt"),
@@ -91,7 +91,7 @@ func TestCmp(t *testing.T) {
{ {
C: ContainsTuple("cnt", 2), C: ContainsTuple("cnt", 2),
S: "cnt CONTAINS (?,?)", S: "cnt CONTAINS (?,?)",
N: []string{"cnt_0", "cnt_1"}, N: []string{"cnt[0]", "cnt[1]"},
}, },
{ {
C: ContainsKey("cntKey"), C: ContainsKey("cntKey"),
@@ -101,7 +101,7 @@ func TestCmp(t *testing.T) {
{ {
C: ContainsKeyTuple("cntKey", 2), C: ContainsKeyTuple("cntKey", 2),
S: "cntKey CONTAINS KEY (?,?)", S: "cntKey CONTAINS KEY (?,?)",
N: []string{"cntKey_0", "cntKey_1"}, N: []string{"cntKey[0]", "cntKey[1]"},
}, },
{ {
C: Like("like"), C: Like("like"),
@@ -111,7 +111,7 @@ func TestCmp(t *testing.T) {
{ {
C: LikeTuple("like", 2), C: LikeTuple("like", 2),
S: "like LIKE (?,?)", S: "like LIKE (?,?)",
N: []string{"like_0", "like_1"}, N: []string{"like[0]", "like[1]"},
}, },
// Custom bind names // Custom bind names
@@ -163,7 +163,7 @@ func TestCmp(t *testing.T) {
{ {
C: LikeTupleNamed("like", 2, "name"), C: LikeTupleNamed("like", 2, "name"),
S: "like LIKE (?,?)", S: "like LIKE (?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
@@ -171,47 +171,47 @@ func TestCmp(t *testing.T) {
{ {
C: EqTupleNamed("eq", 2, "name"), C: EqTupleNamed("eq", 2, "name"),
S: "eq=(?,?)", S: "eq=(?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: NeTupleNamed("ne", 3, "name"), C: NeTupleNamed("ne", 3, "name"),
S: "ne!=(?,?,?)", S: "ne!=(?,?,?)",
N: []string{"name_0", "name_1", "name_2"}, N: []string{"name[0]", "name[1]", "name[2]"},
}, },
{ {
C: LtTupleNamed("lt", 2, "name"), C: LtTupleNamed("lt", 2, "name"),
S: "lt<(?,?)", S: "lt<(?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: LtOrEqTupleNamed("lt", 2, "name"), C: LtOrEqTupleNamed("lt", 2, "name"),
S: "lt<=(?,?)", S: "lt<=(?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: GtTupleNamed("gt", 2, "name"), C: GtTupleNamed("gt", 2, "name"),
S: "gt>(?,?)", S: "gt>(?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: GtOrEqTupleNamed("gt", 2, "name"), C: GtOrEqTupleNamed("gt", 2, "name"),
S: "gt>=(?,?)", S: "gt>=(?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: InTupleNamed("in", 2, "name"), C: InTupleNamed("in", 2, "name"),
S: "in IN (?,?)", S: "in IN (?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: ContainsTupleNamed("cnt", 2, "name"), C: ContainsTupleNamed("cnt", 2, "name"),
S: "cnt CONTAINS (?,?)", S: "cnt CONTAINS (?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
{ {
C: ContainsKeyTupleNamed("cntKey", 2, "name"), C: ContainsKeyTupleNamed("cntKey", 2, "name"),
S: "cntKey CONTAINS KEY (?,?)", S: "cntKey CONTAINS KEY (?,?)",
N: []string{"name_0", "name_1"}, N: []string{"name[0]", "name[1]"},
}, },
// Literals // Literals

6
qb/delete_test.go
View File

@@ -47,19 +47,19 @@ func TestDeleteBuilder(t *testing.T) {
{ {
B: Delete("cycling.cyclist_name").Where(EqTuple("id", 2)).Columns("stars"), B: Delete("cycling.cyclist_name").Where(EqTuple("id", 2)).Columns("stars"),
S: "DELETE stars FROM cycling.cyclist_name WHERE id=(?,?) ", S: "DELETE stars FROM cycling.cyclist_name WHERE id=(?,?) ",
N: []string{"id_0", "id_1"}, N: []string{"id[0]", "id[1]"},
}, },
// Add WHERE for tuple column // Add WHERE for tuple column
{ {
B: Delete("cycling.cyclist_name").Where(w, GtTuple("firstname", 2)), B: Delete("cycling.cyclist_name").Where(w, GtTuple("firstname", 2)),
S: "DELETE FROM cycling.cyclist_name WHERE id=? AND firstname>(?,?) ", S: "DELETE FROM cycling.cyclist_name WHERE id=? AND firstname>(?,?) ",
N: []string{"expr", "firstname_0", "firstname_1"}, N: []string{"expr", "firstname[0]", "firstname[1]"},
}, },
// Add WHERE for all tuple columns // Add WHERE for all tuple columns
{ {
B: Delete("cycling.cyclist_name").Where(EqTuple("id", 2), GtTuple("firstname", 2)), B: Delete("cycling.cyclist_name").Where(EqTuple("id", 2), GtTuple("firstname", 2)),
S: "DELETE FROM cycling.cyclist_name WHERE id=(?,?) AND firstname>(?,?) ", S: "DELETE FROM cycling.cyclist_name WHERE id=(?,?) AND firstname>(?,?) ",
N: []string{"id_0", "id_1", "firstname_0", "firstname_1"}, N: []string{"id[0]", "id[1]", "firstname[0]", "firstname[1]"},
}, },
// Add IF // Add IF
{ {

4
qb/insert_test.go
View File

@@ -113,12 +113,12 @@ func TestInsertBuilder(t *testing.T) {
{ {
B: Insert("cycling.cyclist_name").TupleColumn("id", 2), B: Insert("cycling.cyclist_name").TupleColumn("id", 2),
S: "INSERT INTO cycling.cyclist_name (id) VALUES ((?,?)) ", S: "INSERT INTO cycling.cyclist_name (id) VALUES ((?,?)) ",
N: []string{"id_0", "id_1"}, N: []string{"id[0]", "id[1]"},
}, },
{ {
B: Insert("cycling.cyclist_name").TupleColumn("id", 2).Columns("user_uuid"), B: Insert("cycling.cyclist_name").TupleColumn("id", 2).Columns("user_uuid"),
S: "INSERT INTO cycling.cyclist_name (id,user_uuid) VALUES ((?,?),?) ", S: "INSERT INTO cycling.cyclist_name (id,user_uuid) VALUES ((?,?),?) ",
N: []string{"id_0", "id_1", "user_uuid"}, N: []string{"id[0]", "id[1]", "user_uuid"},
}, },
// Add IF NOT EXISTS // Add IF NOT EXISTS
{ {

4
qb/select_test.go
View File

@@ -70,13 +70,13 @@ func TestSelectBuilder(t *testing.T) {
{ {
B: Select("cycling.cyclist_name").Where(EqTuple("id", 2), Gt("firstname")), B: Select("cycling.cyclist_name").Where(EqTuple("id", 2), Gt("firstname")),
S: "SELECT * FROM cycling.cyclist_name WHERE id=(?,?) AND firstname>? ", S: "SELECT * FROM cycling.cyclist_name WHERE id=(?,?) AND firstname>? ",
N: []string{"id_0", "id_1", "firstname"}, N: []string{"id[0]", "id[1]", "firstname"},
}, },
// Add WHERE with only tuples // Add WHERE with only tuples
{ {
B: Select("cycling.cyclist_name").Where(EqTuple("id", 2), GtTuple("firstname", 2)), B: Select("cycling.cyclist_name").Where(EqTuple("id", 2), GtTuple("firstname", 2)),
S: "SELECT * FROM cycling.cyclist_name WHERE id=(?,?) AND firstname>(?,?) ", S: "SELECT * FROM cycling.cyclist_name WHERE id=(?,?) AND firstname>(?,?) ",
N: []string{"id_0", "id_1", "firstname_0", "firstname_1"}, N: []string{"id[0]", "id[1]", "firstname[0]", "firstname[1]"},
}, },
// Add TIMEOUT // Add TIMEOUT
{ {

2
qb/update_test.go
View File

@@ -48,7 +48,7 @@ func TestUpdateBuilder(t *testing.T) {
{ {
B: Update("cycling.cyclist_name").SetTuple("id", 2).Set("user_uuid", "firstname").Where(EqTuple("id", 2)), B: Update("cycling.cyclist_name").SetTuple("id", 2).Set("user_uuid", "firstname").Where(EqTuple("id", 2)),
S: "UPDATE cycling.cyclist_name SET id=(?,?),user_uuid=?,firstname=? WHERE id=(?,?) ", S: "UPDATE cycling.cyclist_name SET id=(?,?),user_uuid=?,firstname=? WHERE id=(?,?) ",
N: []string{"id_0", "id_1", "user_uuid", "firstname", "id_0", "id_1"}, N: []string{"id[0]", "id[1]", "user_uuid", "firstname", "id[0]", "id[1]"},
}, },
// Add SET SetFunc // Add SET SetFunc
{ {

6
qb/value.go
View File

@@ -32,16 +32,16 @@ type tupleParam struct {
} }
func (t tupleParam) writeCql(cql *bytes.Buffer) (names []string) { func (t tupleParam) writeCql(cql *bytes.Buffer) (names []string) {
baseName := string(t.param) + "_" baseName := string(t.param)
cql.WriteByte('(') cql.WriteByte('(')
for i := 0; i < t.count-1; i++ { for i := 0; i < t.count-1; i++ {
cql.WriteByte('?') cql.WriteByte('?')
cql.WriteByte(',') cql.WriteByte(',')
names = append(names, baseName+strconv.Itoa(i)) names = append(names, baseName+"["+strconv.Itoa(i)+"]")
} }
cql.WriteByte('?') cql.WriteByte('?')
cql.WriteByte(')') cql.WriteByte(')')
names = append(names, baseName+strconv.Itoa(t.count-1)) names = append(names, baseName+"["+strconv.Itoa(t.count-1)+"]")
return return
} }