Skip to content

Commit c4ae699

Browse files
fimacfimac
committed
update naming of query functions
1 parent 84d50fc commit c4ae699

File tree

3 files changed

+41
-35
lines changed

3 files changed

+41
-35
lines changed

‎languages/go/goeql/goeql.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ func (eb *EncryptedBool) Deserialize(data []byte) (EncryptedBool, error) {
150150
return false, fmt.Errorf("invalid format: missing 'p' field")
151151
}
152152

153-
func SerializeMatchQuery(value any, table string, column string) ([]byte, error) {
153+
func MatchQuery(value any, table string, column string) ([]byte, error) {
154154
return SerializeQuery(value, table, column, "match")
155155
}
156-
func SerializeOreQuery(value any, table string, column string) ([]byte, error) {
156+
func OreQuery(value any, table string, column string) ([]byte, error) {
157157
return SerializeQuery(value, table, column, "ore")
158158
}
159-
func SerializeUniqueQuery(value any, table string, column string) ([]byte, error) {
159+
func UniqueQuery(value any, table string, column string) ([]byte, error) {
160160
return SerializeQuery(value, table, column, "unique")
161161
}
162-
func SerializeJsonbQuery(value any, table string, column string) ([]byte, error) {
162+
func JsonbQuery(value any, table string, column string) ([]byte, error) {
163163
return SerializeQuery(value, table, column, "ste_vec")
164164
}
165165

‎languages/go/xorm/e2e_test.go

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ func TestWhereQueryOnUnencryptedColumn(t *testing.T) {
5151
t.Fatalf("Could not insert new example: %v", err)
5252
}
5353

54-
var example Example
54+
var returnedExample Example
5555
text := "sydney"
5656

57-
has, err := engine.Where("non_encrypted_field = ?", text).Get(&example)
57+
has, err := engine.Where("non_encrypted_field = ?", text).Get(&returnedExample)
5858
if err != nil {
5959
t.Fatalf("Could not retrieve example: %v", err)
6060
}
@@ -63,10 +63,10 @@ func TestWhereQueryOnUnencryptedColumn(t *testing.T) {
6363
t.Errorf("Expected has to equal true, got: %v", has)
6464
}
6565

66-
assert.Equal(t, newExample.NonEncryptedField, example.NonEncryptedField, "NonEncryptedField does not match")
67-
assert.Equal(t, newExample.EncryptedIntField, example.EncryptedIntField, "EncryptedIntField does not match")
68-
assert.Equal(t, newExample.EncryptedTextField, example.EncryptedTextField, "EncryptedTextField does not match")
69-
assert.Equal(t, newExample.EncryptedJsonbField, example.EncryptedJsonbField, "EncryptedJsonbField does not match")
66+
assert.Equal(t, newExample.NonEncryptedField, returnedExample.NonEncryptedField, "NonEncryptedField does not match")
67+
assert.Equal(t, newExample.EncryptedIntField, returnedExample.EncryptedIntField, "EncryptedIntField does not match")
68+
assert.Equal(t, newExample.EncryptedTextField, returnedExample.EncryptedTextField, "EncryptedTextField does not match")
69+
assert.Equal(t, newExample.EncryptedJsonbField, returnedExample.EncryptedJsonbField, "EncryptedJsonbField does not match")
7070
}
7171

7272
func TestMatchQueryLongString(t *testing.T) {
@@ -82,6 +82,12 @@ func TestMatchQueryLongString(t *testing.T) {
8282
}
8383

8484
examples := []Example{
85+
{
86+
NonEncryptedField: "brisbane",
87+
EncryptedIntField: 23,
88+
EncryptedTextField: "another string that shouldn't be returned",
89+
EncryptedJsonbField: jsonData,
90+
},
8591
{
8692
NonEncryptedField: "sydney",
8793
EncryptedIntField: 23,
@@ -102,9 +108,9 @@ func TestMatchQueryLongString(t *testing.T) {
102108
t.Errorf("Error inserting examples: %v", err)
103109
}
104110

105-
assert.Equal(t, int64(2), inserted, "Expected to insert 2 rows")
111+
assert.Equal(t, int64(3), inserted, "Expected to insert 2 rows")
106112

107-
query, err := goeql.SerializeMatchQuery("this", "examples", "encrypted_text_field")
113+
query, err := goeql.MatchQuery("this", "examples", "encrypted_text_field")
108114
if err != nil {
109115
log.Fatalf("Error marshaling encrypted_text_field query: %v", err)
110116
}
@@ -119,7 +125,7 @@ func TestMatchQueryLongString(t *testing.T) {
119125
t.Errorf("Expected has to equal true, got: %v", has)
120126
}
121127

122-
assert.Equal(t, returnedExample.EncryptedTextField, EncryptedTextField("this is a long string"), "EncryptedTextField should match")
128+
assert.Equal(t, EncryptedTextField("this is a long string"), returnedExample.EncryptedTextField, "EncryptedTextField should match")
123129
}
124130

125131
func TestMatchQueryEmail(t *testing.T) {
@@ -157,7 +163,7 @@ func TestMatchQueryEmail(t *testing.T) {
157163

158164
assert.Equal(t, int64(2), inserted, "Expected to insert 2 rows")
159165

160-
query, err := goeql.SerializeMatchQuery("test", "examples", "encrypted_text_field")
166+
query, err := goeql.MatchQuery("test", "examples", "encrypted_text_field")
161167
if err != nil {
162168
log.Fatalf("Error marshaling encrypted_text_field query: %v", err)
163169
}
@@ -172,7 +178,7 @@ func TestMatchQueryEmail(t *testing.T) {
172178
t.Errorf("Expected has to equal true, got: %v", has)
173179
}
174180

175-
assert.Equal(t, returnedExample.EncryptedTextField, EncryptedTextField("testemail@test.com"), "EncryptedTextField should match")
181+
assert.Equal(t, EncryptedTextField("testemail@test.com"), returnedExample.EncryptedTextField, "EncryptedTextField should match")
176182
}
177183

178184
func TestJsonbQuerySimple(t *testing.T) {
@@ -218,7 +224,7 @@ func TestJsonbQuerySimple(t *testing.T) {
218224
},
219225
}
220226

221-
query, errTwo := goeql.SerializeJsonbQuery(jsonbQuery, "examples", "encrypted_jsonb_field")
227+
query, errTwo := goeql.JsonbQuery(jsonbQuery, "examples", "encrypted_jsonb_field")
222228
if errTwo != nil {
223229
log.Fatalf("Error marshaling encrypted_jsonb_field: %v", errTwo)
224230
}
@@ -233,7 +239,7 @@ func TestJsonbQuerySimple(t *testing.T) {
233239
t.Errorf("Expected has to equal true, got: %v", has)
234240
}
235241

236-
assert.Equal(t, returnedExample.EncryptedJsonbField, EncryptedJsonbField(expectedJson), "EncryptedJsonb field should match")
242+
assert.Equal(t, EncryptedJsonbField(expectedJson), returnedExample.EncryptedJsonbField, "EncryptedJsonb field should match")
237243
}
238244

239245
func TestJsonbQueryNested(t *testing.T) {
@@ -284,7 +290,7 @@ func TestJsonbQueryNested(t *testing.T) {
284290
},
285291
}
286292

287-
query, errTwo := goeql.SerializeJsonbQuery(jsonbQuery, "examples", "encrypted_jsonb_field")
293+
query, errTwo := goeql.JsonbQuery(jsonbQuery, "examples", "encrypted_jsonb_field")
288294
if errTwo != nil {
289295
log.Fatalf("Error marshaling encrypted_jsonb_field: %v", errTwo)
290296
}
@@ -299,7 +305,7 @@ func TestJsonbQueryNested(t *testing.T) {
299305
t.Errorf("Expected has to equal true, got: %v", has)
300306
}
301307

302-
assert.Equal(t, returnedExample.EncryptedJsonbField, EncryptedJsonbField(expectedJson), "EncryptedJsonb field should match")
308+
assert.Equal(t, EncryptedJsonbField(expectedJson), returnedExample.EncryptedJsonbField, "EncryptedJsonb field should match")
303309
}
304310

305311
func TestOreStringRangeQuery(t *testing.T) {
@@ -331,7 +337,7 @@ func TestOreStringRangeQuery(t *testing.T) {
331337
assert.Equal(t, int64(2), inserted, "Expected to insert 2 rows")
332338

333339
// Query
334-
query, errQuery := goeql.SerializeOreQuery("tree", "examples", "encrypted_text_field")
340+
query, errQuery := goeql.OreQuery("tree", "examples", "encrypted_text_field")
335341
if errQuery != nil {
336342
log.Fatalf("err: %v", errQuery)
337343
}
@@ -346,7 +352,7 @@ func TestOreStringRangeQuery(t *testing.T) {
346352
t.Errorf("Expected has to equal true, got: %v", has)
347353
}
348354

349-
assert.Equal(t, returnedExample.EncryptedTextField, expected, "EncryptedText field should match")
355+
assert.Equal(t, expected, returnedExample.EncryptedTextField, "EncryptedText field should match")
350356
}
351357

352358
func TestOreIntRangeQuery(t *testing.T) {
@@ -378,7 +384,7 @@ func TestOreIntRangeQuery(t *testing.T) {
378384
assert.Equal(t, int64(2), inserted, "Expected to insert 2 rows")
379385

380386
// Query
381-
query, errQuery := goeql.SerializeOreQuery(32, "examples", "encrypted_int_field")
387+
query, errQuery := goeql.OreQuery(32, "examples", "encrypted_int_field")
382388
if errQuery != nil {
383389
log.Fatalf("err: %v", errQuery)
384390
}
@@ -393,7 +399,7 @@ func TestOreIntRangeQuery(t *testing.T) {
393399
t.Errorf("Expected has to equal true, got: %v", has)
394400
}
395401

396-
assert.Equal(t, returnedExample.EncryptedIntField, expected, "EncryptedInt field should match")
402+
assert.Equal(t, expected, returnedExample.EncryptedIntField, "EncryptedInt field should match")
397403
}
398404

399405
func TestOreBoolRangeQuery(t *testing.T) {
@@ -434,7 +440,7 @@ func TestOreBoolRangeQuery(t *testing.T) {
434440
assert.Equal(t, int64(3), inserted, "Expected to insert 3 rows")
435441

436442
// Query
437-
query, errQuery := goeql.SerializeOreQuery(false, "examples", "encrypted_bool_field")
443+
query, errQuery := goeql.OreQuery(false, "examples", "encrypted_bool_field")
438444
if errQuery != nil {
439445
log.Fatalf("err: %v", errQuery)
440446
}
@@ -449,7 +455,7 @@ func TestOreBoolRangeQuery(t *testing.T) {
449455
t.Errorf("Expected has to equal true, got: %v", has)
450456
}
451457

452-
assert.Equal(t, returnedExample.EncryptedBoolField, expected, "EncryptedBool field should match")
458+
assert.Equal(t, expected, returnedExample.EncryptedBoolField, "EncryptedBool field should match")
453459
}
454460

455461
func TestUniqueStringQuery(t *testing.T) {
@@ -490,7 +496,7 @@ func TestUniqueStringQuery(t *testing.T) {
490496
assert.Equal(t, int64(3), inserted, "Expected to insert 3 rows")
491497

492498
// Query
493-
query, errQuery := goeql.SerializeUniqueQuery("testing two", "examples", "encrypted_text_field")
499+
query, errQuery := goeql.UniqueQuery("testing two", "examples", "encrypted_text_field")
494500
if errQuery != nil {
495501
log.Fatalf("err: %v", errQuery)
496502
}
@@ -505,5 +511,5 @@ func TestUniqueStringQuery(t *testing.T) {
505511
t.Errorf("Expected has to equal true, got: %v", has)
506512
}
507513

508-
assert.Equal(t, returnedExample.EncryptedTextField, expected, "EncryptedText field should match")
514+
assert.Equal(t, expected, returnedExample.EncryptedTextField, "EncryptedText field should match")
509515
}

‎languages/go/xorm/example_queries.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func MatchQueryLongString(engine *xorm.Engine) {
6060
fmt.Printf("Example one inserted: %+v\n", newExample)
6161
fmt.Println("")
6262

63-
query, err := goeql.SerializeMatchQuery("this", "examples", "encrypted_text_field")
63+
query, err := goeql.MatchQuery("this", "examples", "encrypted_text_field")
6464
if err != nil {
6565
log.Fatalf("Error marshaling encrypted_text_field: %v", err)
6666
}
@@ -93,7 +93,7 @@ func MatchQueryEmail(engine *xorm.Engine) {
9393
fmt.Printf("Example two inserted!: %+v\n", newExampleTwo)
9494
fmt.Println("")
9595

96-
query, errTwo := goeql.SerializeMatchQuery("some", "examples", "encrypted_text_field")
96+
query, errTwo := goeql.MatchQuery("some", "examples", "encrypted_text_field")
9797
if errTwo != nil {
9898
log.Fatalf("Error marshaling encrypted_text_field: %v", errTwo)
9999
}
@@ -141,7 +141,7 @@ func JsonbQuerySimple(engine *xorm.Engine) {
141141
},
142142
}
143143

144-
query, errTwo := goeql.SerializeJsonbQuery(jsonbQuery, "examples", "encrypted_jsonb_field")
144+
query, errTwo := goeql.JsonbQuery(jsonbQuery, "examples", "encrypted_jsonb_field")
145145
if errTwo != nil {
146146
log.Fatalf("Error marshaling encrypted_jsonb_field: %v", errTwo)
147147
}
@@ -201,7 +201,7 @@ func JsonbQueryDeepNested(engine *xorm.Engine) {
201201
},
202202
}
203203

204-
jsonbQuery, errQuery := goeql.SerializeJsonbQuery(query, "examples", "encrypted_jsonb_field")
204+
jsonbQuery, errQuery := goeql.JsonbQuery(query, "examples", "encrypted_jsonb_field")
205205
if errQuery != nil {
206206
log.Fatalf("err: %v", errQuery)
207207
}
@@ -238,7 +238,7 @@ func OreStringRangeQuery(engine *xorm.Engine) {
238238
fmt.Println("Examples inserted!")
239239

240240
// Query
241-
query, errQuery := goeql.SerializeOreQuery("tree", "examples", "encrypted_text_field")
241+
query, errQuery := goeql.OreQuery("tree", "examples", "encrypted_text_field")
242242
if errQuery != nil {
243243
log.Fatalf("err: %v", errQuery)
244244
}
@@ -276,7 +276,7 @@ func OreIntRangeQuery(engine *xorm.Engine) {
276276
fmt.Println("Examples inserted!", example1)
277277
fmt.Println("Examples inserted!", example2)
278278

279-
serializedOreIntQuery, errQuery := goeql.SerializeOreQuery(32, "examples", "encrypted_int_field")
279+
serializedOreIntQuery, errQuery := goeql.OreQuery(32, "examples", "encrypted_int_field")
280280
if errQuery != nil {
281281
log.Fatalf("err: %v", errQuery)
282282
}
@@ -322,7 +322,7 @@ func OreBoolQuery(engine *xorm.Engine) {
322322
fmt.Println("Example3 inserted!", example3)
323323

324324
// Query
325-
query, errQuery := goeql.SerializeOreQuery(false, "examples", "encrypted_bool_field")
325+
query, errQuery := goeql.OreQuery(false, "examples", "encrypted_bool_field")
326326
if errQuery != nil {
327327
log.Fatalf("err: %v", errQuery)
328328
}
@@ -364,7 +364,7 @@ func UniqueStringQuery(engine *xorm.Engine) {
364364
fmt.Println("Example3 inserted!", example3)
365365

366366
var allExamples []Example
367-
query, errQuery := goeql.SerializeUniqueQuery("test two", "examples", "encrypted_text_field")
367+
query, errQuery := goeql.UniqueQuery("test two", "examples", "encrypted_text_field")
368368
if errQuery != nil {
369369
log.Fatalf("err: %v", errQuery)
370370
}

0 commit comments

Comments
 (0)