This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.13.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/2.13.x by this push:
new e9071133a7 Google-bigquery: Fixed sqlCrudOperations in branch 2.13.x
e9071133a7 is described below
commit e9071133a78b4403778f99dd9bc924a9a417062b
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Tue Nov 22 13:32:20 2022 +0100
Google-bigquery: Fixed sqlCrudOperations in branch 2.13.x
---
.../quarkus/component/google/bigquery/it/GoogleBigqueryTest.java | 2 --
.../src/test/resources/mappings/sql_crud_job01_01.json | 4 ++--
.../src/test/resources/mappings/sql_crud_job01_02.json | 2 +-
.../src/test/resources/mappings/sql_crud_job02_01.json | 4 ++--
.../src/test/resources/mappings/sql_crud_job02_02.json | 2 +-
.../src/test/resources/mappings/sql_crud_job04_01.json | 4 ++--
.../src/test/resources/mappings/sql_crud_job04_02.json | 2 +-
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryTest.java
b/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryTest.java
index edd03336cb..512b662e91 100644
---
a/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryTest.java
+++
b/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryTest.java
@@ -43,7 +43,6 @@ import
org.apache.camel.quarkus.test.support.google.GoogleCloudTestResource;
import org.apache.camel.quarkus.test.support.google.GoogleProperty;
import org.apache.camel.util.CollectionHelper;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.apache.camel.util.CollectionHelper.mapOf;
@@ -281,7 +280,6 @@ class GoogleBigqueryTest {
return retVal;
}
- @Disabled("https://github.com/apache/camel-quarkus/issues/4029";)
@Test
public void sqlCrudOperations() throws Exception {
// create
diff --git
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_01.json
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_01.json
index cc264ad096..e8ba065f2e 100644
---
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_01.json
+++
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_01.json
@@ -5,14 +5,14 @@
"url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
"method" : "POST",
"bodyPatterns" : [ {
- "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"INSERT INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, @col1,
@col2)\",\"queryParameters\":[{\"name\":\"id\",\"parameterType\":{\"type\":\"INT64\"},\"parameterValue\":{\"value\":\"1\"}},{\"name\":\"col2\",\"parameterType\":{\"type\":\"INT64\"},\"parameterValue\":{\"value\":\"3\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"INT64\"},\"parameterValue\":{\"value\":\"2\"}}]
[...]
+ "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"INSERT INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, @col1,
@col2)\",\"queryParameters\":[{\"name\":\"id\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"1\"}},{\"name\":\"col2\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"3\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"2\"
[...]
"ignoreArrayOrder" : true,
"ignoreExtraElements" : true
} ]
},
"response" : {
"status" : 200,
- "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"YE8efVoxnibuwlEE3mpD2A==\",\"id\":\"test-project:US.job01\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job01?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, @col1, @col2)\",\"destinationTable\":{\"pr [...]
+ "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"YE8efVoxnibuwlEE3mpD2A==\",\"id\":\"test-project:US.job01\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job01?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, @col1, @col2)\",\"destinationTable\":{\"pr [...]
"headers" : {
"ETag" : "YE8efVoxnibuwlEE3mpD2A==",
"Content-Type" : "application/json; charset=UTF-8",
diff --git
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_02.json
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_02.json
index a1398d2c04..b9c9f49fa0 100644
---
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_02.json
+++
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_02.json
@@ -7,7 +7,7 @@
},
"response" : {
"status" : 200,
- "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"qt5HVS0v7SbiCBvkTsPEzA==\",\"id\":\"test-project:US.job01\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job01?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, @col1, @col2)\",\"destinationTable\":{\"pr [...]
+ "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"qt5HVS0v7SbiCBvkTsPEzA==\",\"id\":\"test-project:US.job01\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job01?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, @col1, @col2)\",\"destinationTable\":{\"pr [...]
"headers" : {
"ETag" : "qt5HVS0v7SbiCBvkTsPEzA==",
"Content-Type" : "application/json; charset=UTF-8",
diff --git
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_01.json
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_01.json
index 69c45f05e9..73662cde27 100644
---
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_01.json
+++
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_01.json
@@ -5,14 +5,14 @@
"url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
"method" : "POST",
"bodyPatterns" : [ {
- "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"INSERT INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, 3,
4)\",\"queryParameters\":[{\"name\":\"id\",\"parameterType\":{\"type\":\"INT64\"},\"parameterValue\":{\"value\":\"2\"}}],\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job02\",\"projectId\":\"test-project\"}}",
+ "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"INSERT INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, 3,
4)\",\"queryParameters\":[{\"name\":\"id\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"2\"}}],\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job02\",\"projectId\":\"test-project\"}}",
"ignoreArrayOrder" : true,
"ignoreExtraElements" : true
} ]
},
"response" : {
"status" : 200,
- "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"j+3Nz2fnrrpO1p8OuP3Vtg==\",\"id\":\"test-project:US.job02\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job02?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, 3, 4)\",\"destinationTable\":{\"projectId\ [...]
+ "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"j+3Nz2fnrrpO1p8OuP3Vtg==\",\"id\":\"test-project:US.job02\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job02?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, 3, 4)\",\"destinationTable\":{\"projectId\ [...]
"headers" : {
"ETag" : "j+3Nz2fnrrpO1p8OuP3Vtg==",
"Content-Type" : "application/json; charset=UTF-8",
diff --git
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_02.json
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_02.json
index 356be1d8ae..7e617076a2 100644
---
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_02.json
+++
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_02.json
@@ -7,7 +7,7 @@
},
"response" : {
"status" : 200,
- "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"sZpFKLRAijUVLYZaCfWRaw==\",\"id\":\"test-project:US.job02\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job02?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, 3, 4)\",\"destinationTable\":{\"projectId\ [...]
+ "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"sZpFKLRAijUVLYZaCfWRaw==\",\"id\":\"test-project:US.job02\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job02?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"INSERT
INTO
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
VALUES(@id, 3, 4)\",\"destinationTable\":{\"projectId\ [...]
"headers" : {
"ETag" : "sZpFKLRAijUVLYZaCfWRaw==",
"Content-Type" : "application/json; charset=UTF-8",
diff --git
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_01.json
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_01.json
index 0db1587b63..d383a8aea4 100644
---
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_01.json
+++
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_01.json
@@ -5,14 +5,14 @@
"url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
"method" : "POST",
"bodyPatterns" : [ {
- "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"UPDATE
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
SET col1=@col1 WHERE
id=@id\",\"queryParameters\":[{\"name\":\"id\",\"parameterType\":{\"type\":\"INT64\"},\"parameterValue\":{\"value\":\"1\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"INT64\"},\"parameterValue\":{\"value\":\"22\"}}],\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job04\",\"projectId\":\"test-project\"}}",
+ "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"UPDATE
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
SET col1=@col1 WHERE
id=@id\",\"queryParameters\":[{\"name\":\"id\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"1\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"22\"}}],\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job04\",\"projectId\":\"test-project\"}}",
"ignoreArrayOrder" : true,
"ignoreExtraElements" : true
} ]
},
"response" : {
"status" : 200,
- "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"lpUcjoVJphNQgX70VEsbzQ==\",\"id\":\"test-project:US.job04\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job04?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"UPDATE
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
SET col1=@col1 WHERE id=@id\",\"destinationTable\":{\"proje [...]
+ "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"lpUcjoVJphNQgX70VEsbzQ==\",\"id\":\"test-project:US.job04\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job04?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"UPDATE
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
SET col1=@col1 WHERE id=@id\",\"destinationTable\":{\"proje [...]
"headers" : {
"ETag" : "lpUcjoVJphNQgX70VEsbzQ==",
"Content-Type" : "application/json; charset=UTF-8",
diff --git
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_02.json
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_02.json
index 2c0c599a10..de430c9d8d 100644
---
a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_02.json
+++
b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_02.json
@@ -7,7 +7,7 @@
},
"response" : {
"status" : 200,
- "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"ZxIuOmkvxOH76Fq3nocfXw==\",\"id\":\"test-project:US.job04\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job04?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"UPDATE
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
SET col1=@col1 WHERE id=@id\",\"destinationTable\":{\"proje [...]
+ "body" :
"{\"kind\":\"bigquery#job\",\"etag\":\"ZxIuOmkvxOH76Fq3nocfXw==\",\"id\":\"test-project:US.job04\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job04?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-...@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"UPDATE
`test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`
SET col1=@col1 WHERE id=@id\",\"destinationTable\":{\"proje [...]
"headers" : {
"ETag" : "ZxIuOmkvxOH76Fq3nocfXw==",
"Content-Type" : "application/json; charset=UTF-8",
