diff --git a/tests/issues/1049_test.go b/tests/issues/1049_test.go index 53719ea978..0699ad306f 100644 --- a/tests/issues/1049_test.go +++ b/tests/issues/1049_test.go @@ -2,17 +2,17 @@ package issues import ( "context" + "testing" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "testing" ) func Test1049(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1072_test.go b/tests/issues/1072_test.go index 02fa79d4dc..33db6d4cbc 100644 --- a/tests/issues/1072_test.go +++ b/tests/issues/1072_test.go @@ -2,13 +2,15 @@ package issues import ( "context" + "testing" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "testing" ) func Test1072(t *testing.T) { + clickhouse_tests.SkipOnCloud(t, "The JSON data type is an obsolete feature on Cloud.") var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ "max_execution_time": 60, diff --git a/tests/issues/1106_test.go b/tests/issues/1106_test.go index 41f2f62dab..e512a6f506 100644 --- a/tests/issues/1106_test.go +++ b/tests/issues/1106_test.go @@ -13,8 +13,7 @@ import ( func Test1106(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1113_test.go b/tests/issues/1113_test.go index d20c14e99d..054c1bc131 100644 --- a/tests/issues/1113_test.go +++ b/tests/issues/1113_test.go @@ -10,6 +10,7 @@ import ( ) func Test1113(t *testing.T) { + clickhouse_tests.SkipOnCloud(t, "The JSON data type is an obsolete feature on Cloud.") var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ "max_execution_time": 60, diff --git a/tests/issues/1119_test.go b/tests/issues/1119_test.go index 2493b64170..fa48c98d26 100644 --- a/tests/issues/1119_test.go +++ b/tests/issues/1119_test.go @@ -10,6 +10,7 @@ import ( ) func Test1119(t *testing.T) { + clickhouse_tests.SkipOnCloud(t, "The JSON data type is an obsolete feature on Cloud.") var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ "max_execution_time": 60, diff --git a/tests/issues/1128_test.go b/tests/issues/1128_test.go index d4b9d76839..d33ba7e200 100644 --- a/tests/issues/1128_test.go +++ b/tests/issues/1128_test.go @@ -59,8 +59,7 @@ type Test struct { func Test1128(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1164_test.go b/tests/issues/1164_test.go index f044dff284..cc6c1f7518 100644 --- a/tests/issues/1164_test.go +++ b/tests/issues/1164_test.go @@ -3,18 +3,18 @@ package issues import ( "context" "fmt" + "testing" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/column" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "testing" ) func TestIssue1164(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) @@ -57,8 +57,7 @@ func BenchmarkIssue1164(b *testing.B) { b.Run("default-10000", func(b *testing.B) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) @@ -90,8 +89,7 @@ func BenchmarkIssue1164(b *testing.B) { b.Run("preAlloc-10000", func(b *testing.B) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) @@ -125,8 +123,7 @@ func BenchmarkIssue1164(b *testing.B) { b.Run("default-50000", func(b *testing.B) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) @@ -158,8 +155,7 @@ func BenchmarkIssue1164(b *testing.B) { b.Run("preAlloc-50000", func(b *testing.B) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1169_test.go b/tests/issues/1169_test.go index e37aea9881..941bb54efe 100644 --- a/tests/issues/1169_test.go +++ b/tests/issues/1169_test.go @@ -13,8 +13,7 @@ import ( func Test1169(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1200_pr_test.go b/tests/issues/1200_pr_test.go index e5f6513aa2..5bd2fd6d23 100644 --- a/tests/issues/1200_pr_test.go +++ b/tests/issues/1200_pr_test.go @@ -13,8 +13,7 @@ import ( func Test1200(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1216_test.go b/tests/issues/1216_test.go index c6c47b84cd..933753c09d 100644 --- a/tests/issues/1216_test.go +++ b/tests/issues/1216_test.go @@ -12,8 +12,7 @@ import ( func Test1216(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1229_test.go b/tests/issues/1229_test.go index e0c6cc46e0..b5987b1adc 100644 --- a/tests/issues/1229_test.go +++ b/tests/issues/1229_test.go @@ -18,8 +18,7 @@ func Test1229(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1247_test.go b/tests/issues/1247_test.go index 0b5695434c..f0beface85 100644 --- a/tests/issues/1247_test.go +++ b/tests/issues/1247_test.go @@ -12,8 +12,7 @@ import ( func Test1247(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1271_test.go b/tests/issues/1271_test.go index 14fed38bae..b565327f3c 100644 --- a/tests/issues/1271_test.go +++ b/tests/issues/1271_test.go @@ -3,14 +3,15 @@ package issues import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/google/uuid" "math/rand" "runtime" "strings" "testing" "time" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/google/uuid" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" @@ -20,8 +21,7 @@ import ( func Test1271(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection("issues", clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/issues/1280_test.go b/tests/issues/1280_test.go index df4f564f40..d46d25b7a7 100644 --- a/tests/issues/1280_test.go +++ b/tests/issues/1280_test.go @@ -13,8 +13,7 @@ import ( func Test1280(t *testing.T) { var ( conn, err = clickhouse_tests.GetConnection(testSet, clickhouse.Settings{ - "max_execution_time": 60, - "allow_experimental_object_type": true, + "max_execution_time": 60, }, nil, &clickhouse.Compression{ Method: clickhouse.CompressionLZ4, }) diff --git a/tests/std/json_test.go b/tests/std/json_test.go index 2bb41f0a7d..209ec4d22b 100644 --- a/tests/std/json_test.go +++ b/tests/std/json_test.go @@ -20,13 +20,14 @@ package std import ( "crypto/tls" "fmt" + "strconv" + "testing" + "time" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "strconv" - "testing" - "time" ) type Releases struct { @@ -63,6 +64,8 @@ type GithubEvent struct { var testDate, _ = time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", "2022-05-25 17:20:57 +0100 WEST") func TestStdJson(t *testing.T) { + clickhouse_tests.SkipOnCloud(t, "The JSON data type is an obsolete feature on Cloud.") + useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false")) require.NoError(t, err) var tlsConfig *tls.Config @@ -132,6 +135,8 @@ func TestStdJson(t *testing.T) { // https://github.com/ClickHouse/clickhouse-go/issues/645 func TestStdJsonWithMap(t *testing.T) { + clickhouse_tests.SkipOnCloud(t, "The JSON data type is an obsolete feature on Cloud.") + useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false")) require.NoError(t, err) var tlsConfig *tls.Config