Skip to content

Commit 4413e0a

Browse files
zachmuzachmu
committed
fixed var expressions
1 parent 81d2e8b commit 4413e0a

1 file changed

Lines changed: 70 additions & 68 deletions

File tree

‎integration-tests/go-sql-server-driver/tests/sql-server-cluster.yaml‎

Lines changed: 70 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
# Postgres array, e.g. {0}.
1818
# * Backtick identifiers become double-quoted identifiers.
1919
# * `select ... from dual` becomes `select ...`.
20-
# * @@GLOBAL.dolt_cluster_role etc. are kept (tests are skipped regardless).
20+
# * MySQL system-variable access becomes Postgres: `SELECT @@GLOBAL.x` ->
21+
# `SELECT current_setting('x') AS x`, and `SET @@GLOBAL.x = v` /
22+
# `SET @@PERSIST.x = v` -> `SET x = v`.
2123
parallel: true
2224
tests:
2325
- name: persisted role and epoch take precedence over bootstrap values
@@ -63,9 +65,9 @@ tests:
6365
- on: server1
6466
queries:
6567
- exec: "use dolt_cluster"
66-
- query: "select @@GLOBAL.dolt_cluster_role, @@GLOBAL.dolt_cluster_role_epoch"
68+
- query: "select current_setting('dolt_cluster_role') AS dolt_cluster_role, current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
6769
result:
68-
columns: ["@@GLOBAL.dolt_cluster_role","@@GLOBAL.dolt_cluster_role_epoch"]
70+
columns: ["dolt_cluster_role","dolt_cluster_role_epoch"]
6971
rows: [["standby","10"]]
7072
- query: |
7173
select "database", standby_remote, role, epoch from dolt_cluster_status order by "database" asc
@@ -79,9 +81,9 @@ tests:
7981
- on: server1
8082
queries:
8183
- exec: "use dolt_cluster"
82-
- query: "select @@GLOBAL.dolt_cluster_role, @@GLOBAL.dolt_cluster_role_epoch"
84+
- query: "select current_setting('dolt_cluster_role') AS dolt_cluster_role, current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
8385
result:
84-
columns: ["@@GLOBAL.dolt_cluster_role","@@GLOBAL.dolt_cluster_role_epoch"]
86+
columns: ["dolt_cluster_role","dolt_cluster_role_epoch"]
8587
rows: [["standby","10"]]
8688
- name: dolt_assume_cluster_role
8789
skip: "cluster replication not yet implemented in Doltgres"
@@ -125,17 +127,17 @@ tests:
125127
result:
126128
columns: ["dolt_assume_cluster_role"]
127129
rows: [["{0}"]]
128-
- query: "select @@GLOBAL.dolt_cluster_role, @@GLOBAL.dolt_cluster_role_epoch"
130+
- query: "select current_setting('dolt_cluster_role') AS dolt_cluster_role, current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
129131
result:
130-
columns: ["@@GLOBAL.dolt_cluster_role","@@GLOBAL.dolt_cluster_role_epoch"]
132+
columns: ["dolt_cluster_role","dolt_cluster_role_epoch"]
131133
rows: [["standby","10"]]
132134
- query: "select dolt_assume_cluster_role('standby', '12')"
133135
result:
134136
columns: ["dolt_assume_cluster_role"]
135137
rows: [["{0}"]]
136-
- query: "select @@GLOBAL.dolt_cluster_role, @@GLOBAL.dolt_cluster_role_epoch"
138+
- query: "select current_setting('dolt_cluster_role') AS dolt_cluster_role, current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
137139
result:
138-
columns: ["@@GLOBAL.dolt_cluster_role","@@GLOBAL.dolt_cluster_role_epoch"]
140+
columns: ["dolt_cluster_role","dolt_cluster_role_epoch"]
139141
rows: [["standby","12"]]
140142
- query: "select dolt_assume_cluster_role('primary', '13')"
141143
result:
@@ -146,17 +148,17 @@ tests:
146148
error_match: "this connection can no longer be used"
147149
- on: server1
148150
queries:
149-
- query: "select @@GLOBAL.dolt_cluster_role, @@GLOBAL.dolt_cluster_role_epoch"
151+
- query: "select current_setting('dolt_cluster_role') AS dolt_cluster_role, current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
150152
result:
151-
columns: ["@@GLOBAL.dolt_cluster_role","@@GLOBAL.dolt_cluster_role_epoch"]
153+
columns: ["dolt_cluster_role","dolt_cluster_role_epoch"]
152154
rows: [["primary","13"]]
153155
restart_server: {}
154156
# Assert that it comes back up with newly assumed role.
155157
- on: server1
156158
queries:
157-
- query: "select @@GLOBAL.dolt_cluster_role, @@GLOBAL.dolt_cluster_role_epoch"
159+
- query: "select current_setting('dolt_cluster_role') AS dolt_cluster_role, current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
158160
result:
159-
columns: ["@@GLOBAL.dolt_cluster_role","@@GLOBAL.dolt_cluster_role_epoch"]
161+
columns: ["dolt_cluster_role","dolt_cluster_role_epoch"]
160162
rows: [["primary","13"]]
161163
- name: create database makes a new remote
162164
skip: "cluster replication not yet implemented in Doltgres"
@@ -420,9 +422,9 @@ tests:
420422
result:
421423
columns: ["count"]
422424
rows: [["5"]]
423-
- query: "select @@global.dolt_cluster_role_epoch"
425+
- query: "select current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
424426
result:
425-
columns: ["@@global.dolt_cluster_role_epoch"]
427+
columns: ["dolt_cluster_role_epoch"]
426428
rows: [["10"]]
427429
- on: server1
428430
queries:
@@ -444,9 +446,9 @@ tests:
444446
result:
445447
columns: ["count"]
446448
rows: [["10"]]
447-
- query: "select @@global.dolt_cluster_role_epoch"
449+
- query: "select current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
448450
result:
449-
columns: ["@@global.dolt_cluster_role_epoch"]
451+
columns: ["dolt_cluster_role_epoch"]
450452
rows: [["11"]]
451453
- name: standby transitioned to primary becomes read write
452454
skip: "cluster replication not yet implemented in Doltgres"
@@ -623,19 +625,19 @@ tests:
623625
- on: server1
624626
retry_attempts: 100
625627
queries:
626-
- query: "SELECT @@GLOBAL.dolt_cluster_role,@@GLOBAL.dolt_cluster_role_epoch"
628+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role,current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
627629
result:
628-
columns: ["@@GLOBAL.dolt_cluster_role", "@@GLOBAL.dolt_cluster_role_epoch"]
630+
columns: ["dolt_cluster_role", "dolt_cluster_role_epoch"]
629631
rows: [["detected_broken_config", "10"]]
630632
- exec: "use repo1"
631633
- exec: "create table more_vals (i int primary key)"
632634
error_match: "repo1 is read-only"
633635
- on: server2
634636
retry_attempts: 100
635637
queries:
636-
- query: "SELECT @@GLOBAL.dolt_cluster_role,@@GLOBAL.dolt_cluster_role_epoch"
638+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role,current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
637639
result:
638-
columns: ["@@GLOBAL.dolt_cluster_role", "@@GLOBAL.dolt_cluster_role_epoch"]
640+
columns: ["dolt_cluster_role", "dolt_cluster_role_epoch"]
639641
rows: [["detected_broken_config", "10"]]
640642
- exec: "use repo1"
641643
- exec: "create table more_vals (i int primary key)"
@@ -732,9 +734,9 @@ tests:
732734
rows: [["10"]]
733735
- on: server2
734736
queries:
735-
- query: "SELECT @@GLOBAL.dolt_cluster_role,@@GLOBAL.dolt_cluster_role_epoch"
737+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role,current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
736738
result:
737-
columns: ["@@GLOBAL.dolt_cluster_role", "@@GLOBAL.dolt_cluster_role_epoch"]
739+
columns: ["dolt_cluster_role", "dolt_cluster_role_epoch"]
738740
rows: [["standby", "15"]]
739741
- query: "SELECT count(*) FROM repo1.vals"
740742
result:
@@ -837,9 +839,9 @@ tests:
837839
rows: [["5"]]
838840
- on: server1
839841
queries:
840-
- query: "SELECT @@GLOBAL.dolt_cluster_role,@@GLOBAL.dolt_cluster_role_epoch"
842+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role,current_setting('dolt_cluster_role_epoch') AS dolt_cluster_role_epoch"
841843
result:
842-
columns: ["@@GLOBAL.dolt_cluster_role", "@@GLOBAL.dolt_cluster_role_epoch"]
844+
columns: ["dolt_cluster_role", "dolt_cluster_role_epoch"]
843845
rows: [["standby", "15"]]
844846
- query: "SELECT count(*) FROM repo1.vals"
845847
result:
@@ -1224,7 +1226,7 @@ tests:
12241226
connections:
12251227
- on: server1
12261228
queries:
1227-
- exec: 'SET @@PERSIST.dolt_cluster_ack_writes_timeout_secs = 10'
1229+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
12281230
- exec: 'CREATE DATABASE repo1'
12291231
- exec: 'USE repo1'
12301232
- exec: 'CREATE TABLE vals (i INT PRIMARY KEY)'
@@ -1537,7 +1539,7 @@ tests:
15371539
connections:
15381540
- on: server1
15391541
queries:
1540-
- exec: 'SET @@GLOBAL.dolt_cluster_ack_writes_timeout_secs = 10'
1542+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
15411543
- exec: 'create database repo1'
15421544
- exec: 'use repo1'
15431545
- exec: 'create table vals (i int primary key)'
@@ -1620,7 +1622,7 @@ tests:
16201622
connections:
16211623
- on: server1
16221624
queries:
1623-
- exec: 'SET @@GLOBAL.dolt_cluster_ack_writes_timeout_secs = 10'
1625+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
16241626
- exec: 'create database repo1'
16251627
- exec: 'create database droppedrepo'
16261628
- exec: 'use droppedrepo'
@@ -1684,7 +1686,7 @@ tests:
16841686
connections:
16851687
- on: server1
16861688
queries:
1687-
- exec: 'SET @@GLOBAL.dolt_cluster_ack_writes_timeout_secs = 10'
1689+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
16881690
- exec: 'create database repo1'
16891691
- exec: 'use repo1'
16901692
- exec: 'create table vals (a int)'
@@ -1863,7 +1865,7 @@ tests:
18631865
connections:
18641866
- on: server1
18651867
queries:
1866-
- exec: 'SET @@GLOBAL.dolt_cluster_ack_writes_timeout_secs = 10'
1868+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
18671869
- exec: "create database testdb"
18681870
- exec: "use testdb"
18691871
- exec: "create table vals (id int primary key)"
@@ -1878,7 +1880,7 @@ tests:
18781880
columns: ["count"]
18791881
rows:
18801882
- ["2"]
1881-
- exec: 'SET @@GLOBAL.dolt_cluster_ack_writes_timeout_secs = 10'
1883+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
18821884
- exec: "insert into vals values (0),(1),(2)"
18831885
- on: standby_two
18841886
queries:
@@ -1959,7 +1961,7 @@ tests:
19591961
queries:
19601962
- exec: 'CREATE DATABASE repo1'
19611963
- exec: 'USE repo1'
1962-
- exec: 'SET @@GLOBAL.dolt_cluster_ack_writes_timeout_secs = 10'
1964+
- exec: 'SET dolt_cluster_ack_writes_timeout_secs = 10'
19631965
- exec: 'CREATE TABLE t (id SERIAL PRIMARY KEY, v INT)'
19641966
- exec: 'INSERT INTO t(v) VALUES (0),(0),(0),(0),(0)'
19651967
- on: server2
@@ -2026,23 +2028,23 @@ tests:
20262028
- exec: 'CREATE DATABASE repo1'
20272029
- exec: 'USE repo1'
20282030
- exec: 'CREATE TABLE vals (i INT PRIMARY KEY)'
2029-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2031+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
20302032
result:
2031-
columns: ['@@GLOBAL.dolt_cluster_role']
2033+
columns: ['dolt_cluster_role']
20322034
rows: [['primary']]
2033-
- query: 'SELECT @@GLOBAL.read_only'
2035+
- query: "SELECT current_setting('read_only') AS read_only"
20342036
result:
2035-
columns: ['@@GLOBAL.read_only']
2037+
columns: ['read_only']
20362038
rows: [['0']]
20372039
- on: server2
20382040
queries:
2039-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2041+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
20402042
result:
2041-
columns: ['@@GLOBAL.dolt_cluster_role']
2043+
columns: ['dolt_cluster_role']
20422044
rows: [['standby']]
2043-
- query: 'SELECT @@GLOBAL.read_only'
2045+
- query: "SELECT current_setting('read_only') AS read_only"
20442046
result:
2045-
columns: ['@@GLOBAL.read_only']
2047+
columns: ['read_only']
20462048
rows: [['1']]
20472049
- on: server1
20482050
queries:
@@ -2051,27 +2053,27 @@ tests:
20512053
- on: server1
20522054
queries:
20532055
- exec: 'USE repo1'
2054-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2056+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
20552057
result:
2056-
columns: ['@@GLOBAL.dolt_cluster_role']
2058+
columns: ['dolt_cluster_role']
20572059
rows: [['standby']]
2058-
- query: 'SELECT @@GLOBAL.read_only'
2060+
- query: "SELECT current_setting('read_only') AS read_only"
20592061
result:
2060-
columns: ['@@GLOBAL.read_only']
2062+
columns: ['read_only']
20612063
rows: [['1']]
20622064
- on: server2
20632065
queries:
20642066
- exec: "select dolt_assume_cluster_role('primary', 2)"
20652067
- on: server2
20662068
queries:
20672069
- exec: 'USE repo1'
2068-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2070+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
20692071
result:
2070-
columns: ['@@GLOBAL.dolt_cluster_role']
2072+
columns: ['dolt_cluster_role']
20712073
rows: [['primary']]
2072-
- query: 'SELECT @@GLOBAL.read_only'
2074+
- query: "SELECT current_setting('read_only') AS read_only"
20732075
result:
2074-
columns: ['@@GLOBAL.read_only']
2076+
columns: ['read_only']
20752077
rows: [['0']]
20762078
- on: server2
20772079
queries:
@@ -2083,13 +2085,13 @@ tests:
20832085
- on: server1
20842086
queries:
20852087
- exec: 'USE repo1'
2086-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2088+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
20872089
result:
2088-
columns: ['@@GLOBAL.dolt_cluster_role']
2090+
columns: ['dolt_cluster_role']
20892091
rows: [['primary']]
2090-
- query: 'SELECT @@GLOBAL.read_only'
2092+
- query: "SELECT current_setting('read_only') AS read_only"
20912093
result:
2092-
columns: ['@@GLOBAL.read_only']
2094+
columns: ['read_only']
20932095
rows: [['0']]
20942096
# https://github.com/dolthub/dolt/issues/10015
20952097
- name: read_only system variable with behavior config respects cluster role
@@ -2134,47 +2136,47 @@ tests:
21342136
connections:
21352137
- on: server1
21362138
queries:
2137-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2139+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
21382140
result:
2139-
columns: ['@@GLOBAL.dolt_cluster_role']
2141+
columns: ['dolt_cluster_role']
21402142
rows: [['primary']]
2141-
- query: 'SELECT @@GLOBAL.read_only'
2143+
- query: "SELECT current_setting('read_only') AS read_only"
21422144
result:
2143-
columns: ['@@GLOBAL.read_only']
2145+
columns: ['read_only']
21442146
rows: [['1']]
21452147
- on: server2
21462148
queries:
2147-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2149+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
21482150
result:
2149-
columns: ['@@GLOBAL.dolt_cluster_role']
2151+
columns: ['dolt_cluster_role']
21502152
rows: [['standby']]
2151-
- query: 'SELECT @@GLOBAL.read_only'
2153+
- query: "SELECT current_setting('read_only') AS read_only"
21522154
result:
2153-
columns: ['@@GLOBAL.read_only']
2155+
columns: ['read_only']
21542156
rows: [['1']]
21552157
- on: server1
21562158
queries:
21572159
- exec: "select dolt_assume_cluster_role('standby', 2)"
21582160
- on: server1
21592161
queries:
2160-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2162+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
21612163
result:
2162-
columns: ['@@GLOBAL.dolt_cluster_role']
2164+
columns: ['dolt_cluster_role']
21632165
rows: [['standby']]
2164-
- query: 'SELECT @@GLOBAL.read_only'
2166+
- query: "SELECT current_setting('read_only') AS read_only"
21652167
result:
2166-
columns: ['@@GLOBAL.read_only']
2168+
columns: ['read_only']
21672169
rows: [['1']]
21682170
- on: server2
21692171
queries:
21702172
- exec: "select dolt_assume_cluster_role('primary', 2)"
21712173
- on: server2
21722174
queries:
2173-
- query: 'SELECT @@GLOBAL.dolt_cluster_role'
2175+
- query: "SELECT current_setting('dolt_cluster_role') AS dolt_cluster_role"
21742176
result:
2175-
columns: ['@@GLOBAL.dolt_cluster_role']
2177+
columns: ['dolt_cluster_role']
21762178
rows: [['primary']]
2177-
- query: 'SELECT @@GLOBAL.read_only'
2179+
- query: "SELECT current_setting('read_only') AS read_only"
21782180
result:
2179-
columns: ['@@GLOBAL.read_only']
2181+
columns: ['read_only']
21802182
rows: [['1']]

0 commit comments

Comments
 (0)