Skip to content

Commit 5290f8e

Browse files
Run integration tests with C* 5
1 parent 3750d00 commit 5290f8e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
types: [ opened, synchronize, reopened ]
99

1010
env:
11-
CCM_VERSION: "6e71061146f7ae67b84ccd2b1d90d7319b640e4c"
11+
CCM_VERSION: "4621dfee5ad73956b831091a8b863d100d25c610"
1212

1313
jobs:
1414
build:
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
go: [ '1.22', '1.23' ]
38-
cassandra_version: [ '4.0.13', '4.1.6' ]
38+
cassandra_version: [ '4.1.6', '5.0.3' ]
3939
auth: [ "false" ]
4040
compressor: [ "no-compression", "snappy", "lz4" ]
4141
tags: [ "cassandra", "integration", "ccm" ]

cassandra_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -481,15 +481,15 @@ func TestCAS(t *testing.T) {
481481
}
482482

483483
insertBatch := session.Batch(LoggedBatch)
484-
insertBatch.Query("INSERT INTO cas_table (title, revid, last_modified) VALUES ('_foo', 2c3af400-73a4-11e5-9381-29463d90c3f0, DATEOF(NOW()))")
485-
insertBatch.Query("INSERT INTO cas_table (title, revid, last_modified) VALUES ('_foo', 3e4ad2f1-73a4-11e5-9381-29463d90c3f0, DATEOF(NOW()))")
484+
insertBatch.Query("INSERT INTO cas_table (title, revid, last_modified) VALUES ('_foo', 2c3af400-73a4-11e5-9381-29463d90c3f0, TOTIMESTAMP(NOW()))")
485+
insertBatch.Query("INSERT INTO cas_table (title, revid, last_modified) VALUES ('_foo', 3e4ad2f1-73a4-11e5-9381-29463d90c3f0, TOTIMESTAMP(NOW()))")
486486
if err := session.ExecuteBatch(insertBatch); err != nil {
487487
t.Fatal("insert:", err)
488488
}
489489

490490
failBatch = session.Batch(LoggedBatch)
491-
failBatch.Query("UPDATE cas_table SET last_modified = DATEOF(NOW()) WHERE title='_foo' AND revid=2c3af400-73a4-11e5-9381-29463d90c3f0 IF last_modified=DATEOF(NOW());")
492-
failBatch.Query("UPDATE cas_table SET last_modified = DATEOF(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified=DATEOF(NOW());")
491+
failBatch.Query("UPDATE cas_table SET last_modified = TOTIMESTAMP(NOW()) WHERE title='_foo' AND revid=2c3af400-73a4-11e5-9381-29463d90c3f0 IF last_modified=TOTIMESTAMP(NOW());")
492+
failBatch.Query("UPDATE cas_table SET last_modified = TOTIMESTAMP(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified=TOTIMESTAMP(NOW());")
493493
if applied, iter, err := session.ExecuteBatchCAS(failBatch, &titleCAS, &revidCAS, &modifiedCAS); err != nil {
494494
t.Fatal("insert:", err)
495495
} else if applied {
@@ -533,21 +533,21 @@ func TestCAS(t *testing.T) {
533533
}
534534

535535
failBatch = session.Batch(LoggedBatch)
536-
failBatch.Query("UPDATE cas_table SET last_modified = DATEOF(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified = ?", modified)
536+
failBatch.Query("UPDATE cas_table SET last_modified = TOTIMESTAMP(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified = ?", modified)
537537
if _, _, err := session.ExecuteBatchCAS(failBatch, new(bool)); err == nil {
538538
t.Fatal("update should have errored")
539539
}
540540
// make sure MapScanCAS does not panic when MapScan fails
541541
casMap = make(map[string]interface{})
542542
casMap["last_modified"] = false
543-
if _, err := session.Query(`UPDATE cas_table SET last_modified = DATEOF(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified = ?`,
543+
if _, err := session.Query(`UPDATE cas_table SET last_modified = TOTIMESTAMP(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified = ?`,
544544
modified).MapScanCAS(casMap); err == nil {
545545
t.Fatal("update should hvae errored", err)
546546
}
547547

548548
// make sure MapExecuteBatchCAS does not panic when MapScan fails
549549
failBatch = session.Batch(LoggedBatch)
550-
failBatch.Query("UPDATE cas_table SET last_modified = DATEOF(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified = ?", modified)
550+
failBatch.Query("UPDATE cas_table SET last_modified = TOTIMESTAMP(NOW()) WHERE title='_foo' AND revid=3e4ad2f1-73a4-11e5-9381-29463d90c3f0 IF last_modified = ?", modified)
551551
casMap = make(map[string]interface{})
552552
casMap["last_modified"] = false
553553
if _, _, err := session.MapExecuteBatchCAS(failBatch, casMap); err == nil {

0 commit comments

Comments
 (0)