resolve conflict

.github/workflows/connector-node-integration.yml

@@ -77,13 +77,6 @@ jobs:
             echo "Jdbc sink test failed"
             exit 1
           fi
-
-          if python3 integration_tests.py --print_sink; then
-            echo "Print sink test passed"
-          else
-            echo "Print sink test failed"
-            exit 1
-          fi
           cd ..
           echo "all jdbc tests passed"
           

Cargo.toml

@@ -125,4 +125,4 @@ tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0c25710"
 tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev = "95e2fd3" }
 tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "87ca1dc" }
 postgres-types = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "87ca1dc" }
-madsim-rdkafka = { git = "https://github.com/madsim-rs/madsim.git", rev = "43e025d" }
+madsim-rdkafka = { git = "https://github.com/madsim-rs/madsim.git", rev = "52adb98" }

ci/scripts/e2e-sink-test.sh

@@ -66,6 +66,7 @@ export PGPASSWORD=postgres
 psql -h db -U postgres -c "CREATE ROLE test LOGIN SUPERUSER PASSWORD 'connector';"
 createdb -h db -U postgres test
 psql -h db -U postgres -d test -c "CREATE TABLE t4 (v1 int PRIMARY KEY, v2 int);"
+psql -h db -U postgres -d test -c "create table t5 (v1 smallint primary key, v2 int, v3 bigint, v4 float4, v5 float8, v6 decimal, v7 varchar, v8 timestamp, v9 boolean);"
 psql -h db -U postgres -d test < ./e2e_test/sink/remote/pg_create_table.sql
 
 node_port=50051
@@ -98,6 +99,7 @@ echo "--- testing sinks"
 sqllogictest -p 4566 -d dev './e2e_test/sink/append_only_sink.slt'
 sqllogictest -p 4566 -d dev './e2e_test/sink/create_sink_as.slt'
 sqllogictest -p 4566 -d dev './e2e_test/sink/blackhole_sink.slt'
+sqllogictest -p 4566 -d dev './e2e_test/sink/remote/types.slt'
 sleep 1
 
 # check sink destination postgres

ci/workflows/pull-request.yml

@@ -180,7 +180,7 @@ steps:
           config: ci/docker-compose.yml
           mount-buildkite-agent: true
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 6
+    timeout_in_minutes: 7
 
   - label: "regress test"
     command: "ci/scripts/regress-test.sh -p ci-dev"
@@ -288,7 +288,7 @@ steps:
       #     files: "*-junit.xml"
       #     format: "junit"
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 18
+    timeout_in_minutes: 25
 
   - label: "misc check"
     command: "ci/scripts/misc-check.sh"

e2e_test/batch/functions/trim.slt.part

@@ -13,6 +13,51 @@ select trim(trailing 'cba' from 'abcxyzabc');
 ----
 abcxyz
 
+query T
+select trim('cba' from 'abcxyzabc');
+----
+xyz
+
+query T
+select trim(both from '   xyz   ');
+----
+xyz
+
+query T
+select trim(from '   xyz   ');
+----
+xyz
+
+query T
+select trim(both from 'abcxyzabc', 'cba');
+----
+xyz
+
+query T
+select trim(both 'abcxyzabc', 'cba');
+----
+xyz
+
+query T
+select trim(from 'abcxyzabc', 'cba');
+----
+xyz
+
+query T
+select trim('abcxyzabc', 'cba');
+----
+xyz
+
+query T
+select trim(both '   xyz   ');
+----
+xyz
+
+query T
+select trim('   xyz   ');
+----
+xyz
+
 query T
 select ltrim('abcxyzabc', 'bca');
 ----
@@ -22,3 +67,8 @@ query T
 select rtrim('abcxyzabc', 'bca');
 ----
 abcxyz
+
+query T
+select btrim('abcxyzabc', 'bca');
+----
+xyz

e2e_test/ddl/invalid_operation.slt

@@ -184,7 +184,7 @@ drop view src;
 
 # 4.6 sink 
 statement ok
-CREATE SINK sink FROM mv WITH (connector='console', prefix='DEBUG', suffix='');
+CREATE SINK sink FROM mv WITH (connector='blackhole');
 
 # FIXME: improve the error message
 statement error not found

e2e_test/sink/remote/types.slt

@@ -0,0 +1,30 @@
+statement ok
+create table t5 (v1 smallint primary key, v2 int, v3 bigint, v4 float, v5 double, v6 decimal, v7 varchar, v8 timestamp, v9 boolean);
+
+statement ok
+create sink s from t5 with (
+    connector = 'jdbc',
+    jdbc.url='jdbc:postgresql://db:5432/test?user=test&password=connector',
+    table.name = 't5',
+    type = 'upsert'
+);
+
+statement ok
+drop sink s;
+
+statement ok
+drop table t5;
+
+statement ok
+create table t6 (v1 smallint primary key, v2 int, v3 bigint, v4 float, v5 double, v6 decimal, v7 varchar, v8 timestamp, v9 boolean, v10 date, v11 struct<v12 time, v13 timestamptz>, v14 varchar[]);
+
+statement error
+create sink s from t6 with (
+    connector = 'jdbc',
+    jdbc.url='jdbc:postgresql://db:5432/test?user=test&password=connector',
+    table.name = 't6',
+    type = 'upsert'
+);
+
+statement ok
+drop table t6;