You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/11/08 07:11:17 UTC
[camel-quarkus] branch main updated: Google-bigquery: Enable sqlCrudOperations test once Camel version is 18.3
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 5a84b46179 Google-bigquery: Enable sqlCrudOperations test once Camel version is 18.3
5a84b46179 is described below
commit 5a84b46179a2d939360082026a6927f55a328161
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Fri Nov 4 14:26:50 2022 +0100
Google-bigquery: Enable sqlCrudOperations test once Camel version is 18.3
---
.../google/bigquery/it/GoogleBigqueryResource.java | 4 ++--
.../bigquery/it/GoogleBigqueryCustomizer.java | 6 +++---
.../google/bigquery/it/GoogleBigqueryTest.java | 7 +++----
.../test/resources/mappings/sql_crud_job01_01.json | 23 +++++++++++++---------
.../test/resources/mappings/sql_crud_job01_02.json | 23 +++++++++-------------
.../test/resources/mappings/sql_crud_job01_03.json | 15 +++++++-------
.../test/resources/mappings/sql_crud_job01_04.json | 15 +++++++-------
.../test/resources/mappings/sql_crud_job02_01.json | 23 +++++++++++++---------
.../test/resources/mappings/sql_crud_job02_02.json | 23 +++++++++-------------
.../test/resources/mappings/sql_crud_job02_03.json | 12 +++++------
.../test/resources/mappings/sql_crud_job02_04.json | 12 +++++------
.../{sql_crud_01.json => sql_crud_job03_00.json} | 16 +++++++--------
.../test/resources/mappings/sql_crud_job03_01.json | 23 +++++++++++++---------
.../test/resources/mappings/sql_crud_job03_02.json | 23 +++++++++-------------
.../test/resources/mappings/sql_crud_job03_03.json | 15 +++++++-------
.../test/resources/mappings/sql_crud_job03_04.json | 15 +++++++-------
.../test/resources/mappings/sql_crud_job04_01.json | 23 +++++++++++++---------
.../test/resources/mappings/sql_crud_job04_02.json | 23 +++++++++-------------
.../test/resources/mappings/sql_crud_job04_03.json | 12 +++++------
.../test/resources/mappings/sql_crud_job04_04.json | 12 +++++------
.../test/resources/mappings/sql_crud_job05_01.json | 23 +++++++++++++---------
.../test/resources/mappings/sql_crud_job05_02.json | 23 +++++++++-------------
.../test/resources/mappings/sql_crud_job05_03.json | 12 +++++------
.../test/resources/mappings/sql_crud_job05_04.json | 12 +++++------
24 files changed, 197 insertions(+), 198 deletions(-)
diff --git a/integration-tests/google-bigquery/src/main/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryResource.java b/integration-tests/google-bigquery/src/main/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryResource.java
index bb7c4ff596..97a006b8d8 100644
--- a/integration-tests/google-bigquery/src/main/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryResource.java
+++ b/integration-tests/google-bigquery/src/main/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryResource.java
@@ -134,8 +134,8 @@ public class GoogleBigqueryResource {
Map<String, Object> bodyMap = new HashMap<>();
if (body != null) {
- bodyMap.put(body, headers.get(body));
- headers.remove(body);
+ bodyMap.put(body, typedHeaders.get(body));
+ typedHeaders.remove(body);
}
return producerTemplate.requestBodyAndHeaders(uri, bodyMap, typedHeaders,
diff --git a/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java b/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
index 92fc9eb4b0..ed963bed68 100644
--- a/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
+++ b/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
@@ -97,9 +97,9 @@ public class GoogleBigqueryCustomizer implements GoogleTestEnvCustomizer {
//Numeric types can not be used as a headers parameters - see https://issues.apache.org/jira/browse/CAMEL-18382
//new schema uses all columns of string type
final Schema sqlSchema = Schema.of(
- Field.of("id", StandardSQLTypeName.STRING),
- Field.of("col1", StandardSQLTypeName.STRING),
- Field.of("col2", StandardSQLTypeName.STRING));
+ Field.of("id", StandardSQLTypeName.NUMERIC),
+ Field.of("col1", StandardSQLTypeName.NUMERIC),
+ Field.of("col2", StandardSQLTypeName.NUMERIC));
createTable(bigQuery, datasetName, tableNameForSqlCrud, sqlSchema, null);
final Schema partitioningSchema = Schema.of(
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 1943542d25..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 // because of https://github.com/apache/camel-quarkus/issues/4029
@Test
public void sqlCrudOperations() throws Exception {
// create
@@ -296,6 +294,7 @@ class GoogleBigqueryTest {
.then()
.statusCode(200)
.body(is("1"));
+
RestAssured.given()
.contentType(ContentType.JSON)
//once test is disabled, make sure that the types of the columns are aligned to the schema
@@ -342,7 +341,7 @@ class GoogleBigqueryTest {
RestAssured.given()
.contentType(ContentType.JSON)
.body(mapWithJobId("job05", Collections.emptyMap()))
- .queryParam("sql", String.format("DELETE FROM `%s.%s.%s` WHERE id='1'",
+ .queryParam("sql", String.format("DELETE FROM `%s.%s.%s` WHERE id=1",
projectId, dataset, tableNameForSqlCrud))
.post("executeSql")
.then()
@@ -357,7 +356,7 @@ class GoogleBigqueryTest {
TableResult tr = getTableData(dataset + "." + tableNameForSqlCrud);
Assertions.assertEquals(1, tr.getTotalRows());
List<List<Object>> results = parseResult(tr);
- Assertions.assertEquals("s3", results.get(0).get(1));
+ Assertions.assertEquals("3", results.get(0).get(1));
}
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 908b6d0da2..cc264ad096 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
@@ -1,18 +1,23 @@
{
- "id" : "f5f69f34-d01b-4719-af13-2af4270c1424",
- "name" : "bigquery_v2_projects_test-project_jobs_job01",
+ "id" : "68ce63ca-41e7-4d4c-8a18-e968f3621729",
+ "name" : "bigquery_v2_projects_test-project_jobs",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs/job01?location=US&prettyPrint=false",
- "method" : "GET"
+ "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\"}}] [...]
+ "ignoreArrayOrder" : true,
+ "ignoreExtraElements" : true
+ } ]
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"MndcVB9RexbOqoawz0aSXA==\",\"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-acc@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-acc@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" : "MndcVB9RexbOqoawz0aSXA==",
+ "ETag" : "YE8efVoxnibuwlEE3mpD2A==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:11 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:20:55 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,7 +26,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "f5f69f34-d01b-4719-af13-2af4270c1424",
+ "uuid" : "68ce63ca-41e7-4d4c-8a18-e968f3621729",
"persistent" : true,
- "insertionIndex" : 70
+ "insertionIndex" : 14
}
\ No newline at end of file
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 2edb955b67..a1398d2c04 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
@@ -1,23 +1,18 @@
{
- "id" : "91b02b07-1205-472f-9537-3b71e8c500cc",
- "name" : "bigquery_v2_projects_test-project_jobs",
+ "id" : "6aa5e3e9-21b5-4713-9001-cbe2c2833954",
+ "name" : "bigquery_v2_projects_test-project_jobs_job01",
"request" : {
- "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\":\"STRING\"},\"parameterValue\":{\"value\":\"1\"}},{\"name\":\"col2\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"3\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"2\" [...]
- "ignoreArrayOrder" : true,
- "ignoreExtraElements" : true
- } ]
+ "url" : "/bigquery/v2/projects/test-project/jobs/job01?location=US&prettyPrint=false",
+ "method" : "GET"
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"cELAF807ubJ6hyVWXLlslA==\",\"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-acc@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-acc@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" : "cELAF807ubJ6hyVWXLlslA==",
+ "ETag" : "qt5HVS0v7SbiCBvkTsPEzA==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:09 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:20:57 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -26,7 +21,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "91b02b07-1205-472f-9537-3b71e8c500cc",
+ "uuid" : "6aa5e3e9-21b5-4713-9001-cbe2c2833954",
"persistent" : true,
- "insertionIndex" : 68
+ "insertionIndex" : 16
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_03.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_03.json
index ca32382a83..74bb8fe17c 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_03.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_03.json
@@ -1,5 +1,5 @@
{
- "id" : "21da255d-c848-42b1-b99f-a447191edb8d",
+ "id" : "58b9847e-6747-4ace-961d-561beb5f0ea6",
"name" : "bigquery_v2_projects_test-project_queries_job01",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job01?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"WXsrmb8BQDTKs0iq7TRL4Q==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job01\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"obpTQvBNjrqVh0yA3ST9tw==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job01\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "WXsrmb8BQDTKs0iq7TRL4Q==",
+ "ETag" : "obpTQvBNjrqVh0yA3ST9tw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:10 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:20:58 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,10 +21,9 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "21da255d-c848-42b1-b99f-a447191edb8d",
+ "uuid" : "58b9847e-6747-4ace-961d-561beb5f0ea6",
"persistent" : true,
"scenarioName" : "scenario-1-bigquery-v2-projects-test-project-queries-job01",
- "requiredScenarioState" : "Started",
- "newScenarioState" : "scenario-1-bigquery-v2-projects-test-project-queries-job01-2",
- "insertionIndex" : 69
+ "requiredScenarioState" : "scenario-1-bigquery-v2-projects-test-project-queries-job01-2",
+ "insertionIndex" : 17
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_04.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_04.json
index 0fc4cc6b13..52f9bdf820 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_04.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job01_04.json
@@ -1,5 +1,5 @@
{
- "id" : "8e891636-023e-4f1d-b8be-da5fc2897362",
+ "id" : "71e28a99-9b95-49a0-962d-ece4d85c1d27",
"name" : "bigquery_v2_projects_test-project_queries_job01",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job01?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"WXsrmb8BQDTKs0iq7TRL4Q==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job01\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"obpTQvBNjrqVh0yA3ST9tw==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job01\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "WXsrmb8BQDTKs0iq7TRL4Q==",
+ "ETag" : "obpTQvBNjrqVh0yA3ST9tw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:11 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:20:57 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,9 +21,10 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "8e891636-023e-4f1d-b8be-da5fc2897362",
+ "uuid" : "71e28a99-9b95-49a0-962d-ece4d85c1d27",
"persistent" : true,
"scenarioName" : "scenario-1-bigquery-v2-projects-test-project-queries-job01",
- "requiredScenarioState" : "scenario-1-bigquery-v2-projects-test-project-queries-job01-2",
- "insertionIndex" : 71
+ "requiredScenarioState" : "Started",
+ "newScenarioState" : "scenario-1-bigquery-v2-projects-test-project-queries-job01-2",
+ "insertionIndex" : 15
}
\ No newline at end of file
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 50e1501281..69c45f05e9 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
@@ -1,18 +1,23 @@
{
- "id" : "8c047364-fa25-4fee-b071-82675d61ed88",
- "name" : "bigquery_v2_projects_test-project_jobs_job02",
+ "id" : "66ac766a-9f3e-4e8a-94ce-ec7cf40910c9",
+ "name" : "bigquery_v2_projects_test-project_jobs",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs/job02?location=US&prettyPrint=false",
- "method" : "GET"
+ "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\"}}",
+ "ignoreArrayOrder" : true,
+ "ignoreExtraElements" : true
+ } ]
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"CHp6n19TrampRaMDtYkLIQ==\",\"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-acc@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\":\"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-acc@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" : "CHp6n19TrampRaMDtYkLIQ==",
+ "ETag" : "j+3Nz2fnrrpO1p8OuP3Vtg==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:14 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:23:48 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,7 +26,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "8c047364-fa25-4fee-b071-82675d61ed88",
+ "uuid" : "66ac766a-9f3e-4e8a-94ce-ec7cf40910c9",
"persistent" : true,
- "insertionIndex" : 74
+ "insertionIndex" : 22
}
\ No newline at end of file
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 62c1e0f166..356be1d8ae 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
@@ -1,23 +1,18 @@
{
- "id" : "d8093d2b-96f4-4b34-96a6-f687e42bb88a",
- "name" : "bigquery_v2_projects_test-project_jobs",
+ "id" : "e85c779b-9668-451a-8a62-3daeafdb5e6e",
+ "name" : "bigquery_v2_projects_test-project_jobs_job02",
"request" : {
- "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\":\"STRING\"},\"parameterValue\":{\"value\":\"2\"}},{\"name\":\"col2\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"4\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"3\" [...]
- "ignoreArrayOrder" : true,
- "ignoreExtraElements" : true
- } ]
+ "url" : "/bigquery/v2/projects/test-project/jobs/job02?location=US&prettyPrint=false",
+ "method" : "GET"
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"c1ilwn5FE7GB1viT6gCL6Q==\",\"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-acc@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\":\"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-acc@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" : "c1ilwn5FE7GB1viT6gCL6Q==",
+ "ETag" : "sZpFKLRAijUVLYZaCfWRaw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:12 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:23:50 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -26,7 +21,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "d8093d2b-96f4-4b34-96a6-f687e42bb88a",
+ "uuid" : "e85c779b-9668-451a-8a62-3daeafdb5e6e",
"persistent" : true,
- "insertionIndex" : 72
+ "insertionIndex" : 24
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_03.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_03.json
index aef9086cc8..8064738bea 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_03.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_03.json
@@ -1,5 +1,5 @@
{
- "id" : "b9dc5bee-daf5-4ecc-b592-964810edf3bc",
+ "id" : "3721a10d-681e-46da-a239-5af8b8e05d3f",
"name" : "bigquery_v2_projects_test-project_queries_job02",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job02?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"PQrqlwAC+Qg+gcd+wtq4oQ==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job02\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"GJ31krf5jZcgryB7xlvY5Q==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job02\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "PQrqlwAC+Qg+gcd+wtq4oQ==",
+ "ETag" : "GJ31krf5jZcgryB7xlvY5Q==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:14 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:23:50 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,9 +21,9 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "b9dc5bee-daf5-4ecc-b592-964810edf3bc",
+ "uuid" : "3721a10d-681e-46da-a239-5af8b8e05d3f",
"persistent" : true,
"scenarioName" : "scenario-2-bigquery-v2-projects-test-project-queries-job02",
"requiredScenarioState" : "scenario-2-bigquery-v2-projects-test-project-queries-job02-2",
- "insertionIndex" : 75
+ "insertionIndex" : 25
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_04.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_04.json
index 5ee3c474e0..7518b05c0b 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_04.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job02_04.json
@@ -1,5 +1,5 @@
{
- "id" : "cb590b37-2c92-4b47-a0dd-a324b85036c5",
+ "id" : "b27dfa22-115f-41d9-ba2e-a10ac6680b48",
"name" : "bigquery_v2_projects_test-project_queries_job02",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job02?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"PQrqlwAC+Qg+gcd+wtq4oQ==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job02\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"GJ31krf5jZcgryB7xlvY5Q==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job02\",\"location\":\"US\"},\"totalBytesProcessed\":\"0\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "PQrqlwAC+Qg+gcd+wtq4oQ==",
+ "ETag" : "GJ31krf5jZcgryB7xlvY5Q==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:13 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:23:50 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,10 +21,10 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "cb590b37-2c92-4b47-a0dd-a324b85036c5",
+ "uuid" : "b27dfa22-115f-41d9-ba2e-a10ac6680b48",
"persistent" : true,
"scenarioName" : "scenario-2-bigquery-v2-projects-test-project-queries-job02",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-2-bigquery-v2-projects-test-project-queries-job02-2",
- "insertionIndex" : 73
+ "insertionIndex" : 23
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_01.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_00.json
similarity index 57%
rename from integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_01.json
rename to integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_00.json
index ad14fee938..3842354452 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_01.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_00.json
@@ -1,18 +1,18 @@
{
- "id" : "9af2716d-51ac-4644-bb87-67b15872b43f",
- "name" : "bigquery_v2_projects_test-project_datasets__cd8b40856acd1b6890f170712a53c7133d5b133e_tables_anondfb1a020ae5675902d3fdea6bf50c621f3724395_data",
+ "id" : "75be96c4-8857-4ba8-8cc5-7ba3055ff6c6",
+ "name" : "bigquery_v2_projects_test-project_datasets__cd8b40856acd1b6890f170712a53c7133d5b133e_tables_anonc52b02d9c585e335ca4ef4a791fd546226a7f7282acb8c091fdf569527091089_data",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/datasets/_cd8b40856acd1b6890f170712a53c7133d5b133e/tables/anondfb1a020ae5675902d3fdea6bf50c621f3724395/data?prettyPrint=false",
+ "url" : "/bigquery/v2/projects/test-project/datasets/_cd8b40856acd1b6890f170712a53c7133d5b133e/tables/anonc52b02d9c585e335ca4ef4a791fd546226a7f7282acb8c091fdf569527091089/data?prettyPrint=false",
"method" : "GET"
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#tableDataList\",\"etag\":\"oxq0ojQI+xlbvPuz2SttNw==\",\"totalRows\":\"2\",\"rows\":[{\"f\":[{\"v\":\"2\"},{\"v\":\"3\"},{\"v\":\"4\"}]},{\"f\":[{\"v\":\"1\"},{\"v\":\"2\"},{\"v\":\"3\"}]}]}",
+ "body" : "{\"kind\":\"bigquery#tableDataList\",\"etag\":\"WmB1ZZ+K63O8/0BaMWyyWQ==\",\"totalRows\":\"2\",\"rows\":[{\"f\":[{\"v\":\"2\"},{\"v\":\"3\"},{\"v\":\"4\"}]},{\"f\":[{\"v\":\"1\"},{\"v\":\"2\"},{\"v\":\"3\"}]}]}",
"headers" : {
- "ETag" : "oxq0ojQI+xlbvPuz2SttNw==",
+ "ETag" : "WmB1ZZ+K63O8/0BaMWyyWQ==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:17 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:34:11 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -20,7 +20,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "9af2716d-51ac-4644-bb87-67b15872b43f",
+ "uuid" : "75be96c4-8857-4ba8-8cc5-7ba3055ff6c6",
"persistent" : true,
- "insertionIndex" : 80
+ "insertionIndex" : 34
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_01.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_01.json
index 5b3aef3882..ff84884c5e 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_01.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_01.json
@@ -1,18 +1,23 @@
{
- "id" : "0ba437c0-befa-47c3-a7bc-bc17b506d17d",
- "name" : "bigquery_v2_projects_test-project_jobs_job03",
+ "id" : "5346ae41-e2d6-49a6-9bd1-75acffe48283",
+ "name" : "bigquery_v2_projects_test-project_jobs",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs/job03?location=US&prettyPrint=false",
- "method" : "GET"
+ "url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
+ "method" : "POST",
+ "bodyPatterns" : [ {
+ "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"SELECT * FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`\",\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job03\",\"projectId\":\"test-project\"}}",
+ "ignoreArrayOrder" : true,
+ "ignoreExtraElements" : true
+ } ]
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"kxNcuPBuQQF/FHEpF19sNw==\",\"id\":\"test-project:US.job03\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job03?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"SELECT * FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`\",\"destinationTable\":{\"projectId\":\"test-project [...]
+ "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"hnOMHyh4x9sDAzcNWqNzIg==\",\"id\":\"test-project:US.job03\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job03?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"SELECT * FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`\",\"destinationTable\":{\"projectId\":\"test-project [...]
"headers" : {
- "ETag" : "kxNcuPBuQQF/FHEpF19sNw==",
+ "ETag" : "hnOMHyh4x9sDAzcNWqNzIg==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:16 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:34:10 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,7 +26,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "0ba437c0-befa-47c3-a7bc-bc17b506d17d",
+ "uuid" : "5346ae41-e2d6-49a6-9bd1-75acffe48283",
"persistent" : true,
- "insertionIndex" : 78
+ "insertionIndex" : 30
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_02.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_02.json
index 26eb884f76..cc3fe43e5f 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_02.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_02.json
@@ -1,23 +1,18 @@
{
- "id" : "1234e4a0-ec75-4aa7-a72c-163b29c8648e",
- "name" : "bigquery_v2_projects_test-project_jobs",
+ "id" : "ec613dcc-1c45-4223-afaa-479570987a79",
+ "name" : "bigquery_v2_projects_test-project_jobs_job03",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
- "method" : "POST",
- "bodyPatterns" : [ {
- "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"SELECT * FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`\",\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job03\",\"projectId\":\"test-project\"}}",
- "ignoreArrayOrder" : true,
- "ignoreExtraElements" : true
- } ]
+ "url" : "/bigquery/v2/projects/test-project/jobs/job03?location=US&prettyPrint=false",
+ "method" : "GET"
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"kxNcuPBuQQF/FHEpF19sNw==\",\"id\":\"test-project:US.job03\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job03?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"SELECT * FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`\",\"destinationTable\":{\"projectId\":\"test-project [...]
+ "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"u1huzXHMqRMg1ODsav2rUA==\",\"id\":\"test-project:US.job03\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job03?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"SELECT * FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud`\",\"destinationTable\":{\"projectId\":\"test-project [...]
"headers" : {
- "ETag" : "kxNcuPBuQQF/FHEpF19sNw==",
+ "ETag" : "u1huzXHMqRMg1ODsav2rUA==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:15 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:34:11 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -26,7 +21,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "1234e4a0-ec75-4aa7-a72c-163b29c8648e",
+ "uuid" : "ec613dcc-1c45-4223-afaa-479570987a79",
"persistent" : true,
- "insertionIndex" : 76
+ "insertionIndex" : 32
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_03.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_03.json
index 42ec6e0c90..cf848793fc 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_03.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_03.json
@@ -1,5 +1,5 @@
{
- "id" : "d44c9eaf-66b0-4da6-8816-5e3b3410a77f",
+ "id" : "40d812c1-4b6c-42ba-99fe-5f564e4a4a55",
"name" : "bigquery_v2_projects_test-project_queries_job03",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job03?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"wKf5AQzH+4X5aGWu00XEFA==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\",\"mode\":\"NULLABLE\"},{\"name\":\"col1\",\"type\":\"STRING\",\"mode\":\"NULLABLE\"},{\"name\":\"col2\",\"type\":\"STRING\",\"mode\":\"NULLABLE\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job03\",\"location\":\"US\"},\"totalRows\":\"2\",\"totalBytesProcessed\":\"18\",\"jobComplete\":true,\"cacheHit\":false}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"wZaPj2qWcRr5BAIh+KKi5w==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\",\"mode\":\"NULLABLE\"},{\"name\":\"col1\",\"type\":\"NUMERIC\",\"mode\":\"NULLABLE\"},{\"name\":\"col2\",\"type\":\"NUMERIC\",\"mode\":\"NULLABLE\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job03\",\"location\":\"US\"},\"totalRows\":\"2\",\"totalBytesProcessed\":\"96\",\"jobComplete\":true,\"cacheHit\":false}",
"headers" : {
- "ETag" : "wKf5AQzH+4X5aGWu00XEFA==",
+ "ETag" : "wZaPj2qWcRr5BAIh+KKi5w==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:15 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:34:11 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,10 +21,9 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "d44c9eaf-66b0-4da6-8816-5e3b3410a77f",
+ "uuid" : "40d812c1-4b6c-42ba-99fe-5f564e4a4a55",
"persistent" : true,
"scenarioName" : "scenario-3-bigquery-v2-projects-test-project-queries-job03",
- "requiredScenarioState" : "Started",
- "newScenarioState" : "scenario-3-bigquery-v2-projects-test-project-queries-job03-2",
- "insertionIndex" : 77
+ "requiredScenarioState" : "scenario-3-bigquery-v2-projects-test-project-queries-job03-2",
+ "insertionIndex" : 33
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_04.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_04.json
index 1303504f6e..ac986acae5 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_04.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job03_04.json
@@ -1,5 +1,5 @@
{
- "id" : "f14f2622-f740-4ab2-adbe-41ddbdc29795",
+ "id" : "71490873-febf-4111-b574-19d7c13dc0a3",
"name" : "bigquery_v2_projects_test-project_queries_job03",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job03?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"wKf5AQzH+4X5aGWu00XEFA==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\",\"mode\":\"NULLABLE\"},{\"name\":\"col1\",\"type\":\"STRING\",\"mode\":\"NULLABLE\"},{\"name\":\"col2\",\"type\":\"STRING\",\"mode\":\"NULLABLE\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job03\",\"location\":\"US\"},\"totalRows\":\"2\",\"totalBytesProcessed\":\"18\",\"jobComplete\":true,\"cacheHit\":false}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"wZaPj2qWcRr5BAIh+KKi5w==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\",\"mode\":\"NULLABLE\"},{\"name\":\"col1\",\"type\":\"NUMERIC\",\"mode\":\"NULLABLE\"},{\"name\":\"col2\",\"type\":\"NUMERIC\",\"mode\":\"NULLABLE\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job03\",\"location\":\"US\"},\"totalRows\":\"2\",\"totalBytesProcessed\":\"96\",\"jobComplete\":true,\"cacheHit\":false}",
"headers" : {
- "ETag" : "wKf5AQzH+4X5aGWu00XEFA==",
+ "ETag" : "wZaPj2qWcRr5BAIh+KKi5w==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:16 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:34:10 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,9 +21,10 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "f14f2622-f740-4ab2-adbe-41ddbdc29795",
+ "uuid" : "71490873-febf-4111-b574-19d7c13dc0a3",
"persistent" : true,
"scenarioName" : "scenario-3-bigquery-v2-projects-test-project-queries-job03",
- "requiredScenarioState" : "scenario-3-bigquery-v2-projects-test-project-queries-job03-2",
- "insertionIndex" : 79
+ "requiredScenarioState" : "Started",
+ "newScenarioState" : "scenario-3-bigquery-v2-projects-test-project-queries-job03-2",
+ "insertionIndex" : 31
}
\ No newline at end of file
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 5872cea900..0db1587b63 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
@@ -1,18 +1,23 @@
{
- "id" : "04195857-c527-441f-98c6-9e2361bcd4d9",
- "name" : "bigquery_v2_projects_test-project_jobs_job04",
+ "id" : "71ed0831-c12f-4f6e-ada8-362dbbedbb8f",
+ "name" : "bigquery_v2_projects_test-project_jobs",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs/job04?location=US&prettyPrint=false",
- "method" : "GET"
+ "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\"}}",
+ "ignoreArrayOrder" : true,
+ "ignoreExtraElements" : true
+ } ]
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"DivD5pBYVlqbUduSHLQ5GA==\",\"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-acc@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-acc@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" : "DivD5pBYVlqbUduSHLQ5GA==",
+ "ETag" : "lpUcjoVJphNQgX70VEsbzQ==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:20 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:40:51 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,7 +26,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "04195857-c527-441f-98c6-9e2361bcd4d9",
+ "uuid" : "71ed0831-c12f-4f6e-ada8-362dbbedbb8f",
"persistent" : true,
- "insertionIndex" : 83
+ "insertionIndex" : 40
}
\ No newline at end of file
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 a1a204632b..2c0c599a10 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
@@ -1,23 +1,18 @@
{
- "id" : "76b0f447-6f4e-414a-ad0e-ffef6d4406ce",
- "name" : "bigquery_v2_projects_test-project_jobs",
+ "id" : "be6fb536-47d7-45cf-9c82-b348c6dda739",
+ "name" : "bigquery_v2_projects_test-project_jobs_job04",
"request" : {
- "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\":\"STRING\"},\"parameterValue\":{\"value\":\"1\"}},{\"name\":\"col1\",\"parameterType\":{\"type\":\"STRING\"},\"parameterValue\":{\"value\":\"22\"}}],\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job04\",\"projectId\":\"test-project\"}}",
- "ignoreArrayOrder" : true,
- "ignoreExtraElements" : true
- } ]
+ "url" : "/bigquery/v2/projects/test-project/jobs/job04?location=US&prettyPrint=false",
+ "method" : "GET"
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"jHH8+3oHrwFGyqjAxmEccQ==\",\"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-acc@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-acc@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" : "jHH8+3oHrwFGyqjAxmEccQ==",
+ "ETag" : "ZxIuOmkvxOH76Fq3nocfXw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:18 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:40:53 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -26,7 +21,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "76b0f447-6f4e-414a-ad0e-ffef6d4406ce",
+ "uuid" : "be6fb536-47d7-45cf-9c82-b348c6dda739",
"persistent" : true,
- "insertionIndex" : 81
+ "insertionIndex" : 42
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_03.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_03.json
index 91a18128d2..707715b74e 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_03.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_03.json
@@ -1,5 +1,5 @@
{
- "id" : "3d011219-20ed-4413-9710-4c019be9e35a",
+ "id" : "2f39f44e-455f-4dfa-81bb-bfe0dce90f22",
"name" : "bigquery_v2_projects_test-project_queries_job04",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job04?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"XDWI6tsTuEDaxN466Nbq5w==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job04\",\"location\":\"US\"},\"totalBytesProcessed\":\"18\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"QWUVmH5bYYEdIh+Zir9T9g==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job04\",\"location\":\"US\"},\"totalBytesProcessed\":\"96\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "XDWI6tsTuEDaxN466Nbq5w==",
+ "ETag" : "QWUVmH5bYYEdIh+Zir9T9g==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:20 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:40:53 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,10 +21,10 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "3d011219-20ed-4413-9710-4c019be9e35a",
+ "uuid" : "2f39f44e-455f-4dfa-81bb-bfe0dce90f22",
"persistent" : true,
"scenarioName" : "scenario-4-bigquery-v2-projects-test-project-queries-job04",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-4-bigquery-v2-projects-test-project-queries-job04-2",
- "insertionIndex" : 82
+ "insertionIndex" : 41
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_04.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_04.json
index f227bd90c0..b5979f02a1 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_04.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job04_04.json
@@ -1,5 +1,5 @@
{
- "id" : "c01ecfc9-87a9-4891-a976-75d5189239b0",
+ "id" : "34db823c-c36b-4d45-a46d-bd9c63f7b592",
"name" : "bigquery_v2_projects_test-project_queries_job04",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job04?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"XDWI6tsTuEDaxN466Nbq5w==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job04\",\"location\":\"US\"},\"totalBytesProcessed\":\"18\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"QWUVmH5bYYEdIh+Zir9T9g==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job04\",\"location\":\"US\"},\"totalBytesProcessed\":\"96\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "XDWI6tsTuEDaxN466Nbq5w==",
+ "ETag" : "QWUVmH5bYYEdIh+Zir9T9g==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:20 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:40:54 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,9 +21,9 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "c01ecfc9-87a9-4891-a976-75d5189239b0",
+ "uuid" : "34db823c-c36b-4d45-a46d-bd9c63f7b592",
"persistent" : true,
"scenarioName" : "scenario-4-bigquery-v2-projects-test-project-queries-job04",
"requiredScenarioState" : "scenario-4-bigquery-v2-projects-test-project-queries-job04-2",
- "insertionIndex" : 84
+ "insertionIndex" : 43
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_01.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_01.json
index a7ab749cb0..dda759bb5a 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_01.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_01.json
@@ -1,18 +1,23 @@
{
- "id" : "96d45b04-c0e2-4761-8e76-5527d60bc8c6",
- "name" : "bigquery_v2_projects_test-project_jobs_job05",
+ "id" : "ad19305e-a451-41ca-8b44-1cafa27579da",
+ "name" : "bigquery_v2_projects_test-project_jobs",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs/job05?location=US&prettyPrint=false",
- "method" : "GET"
+ "url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
+ "method" : "POST",
+ "bodyPatterns" : [ {
+ "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"DELETE FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud` WHERE id=1\",\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job05\",\"projectId\":\"test-project\"}}",
+ "ignoreArrayOrder" : true,
+ "ignoreExtraElements" : true
+ } ]
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"wNZARAB+iI2ylv+RZy3ecw==\",\"id\":\"test-project:US.job05\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job05?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"DELETE FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud` WHERE id='1'\",\"destinationTable\":{\"projectId\":\"t [...]
+ "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"81sqDaPsb1lwOMm90j+7WQ==\",\"id\":\"test-project:US.job05\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job05?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"DELETE FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud` WHERE id=1\",\"destinationTable\":{\"projectId\":\"tes [...]
"headers" : {
- "ETag" : "wNZARAB+iI2ylv+RZy3ecw==",
+ "ETag" : "81sqDaPsb1lwOMm90j+7WQ==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:26 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:46:54 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,7 +26,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "96d45b04-c0e2-4761-8e76-5527d60bc8c6",
+ "uuid" : "ad19305e-a451-41ca-8b44-1cafa27579da",
"persistent" : true,
- "insertionIndex" : 87
+ "insertionIndex" : 48
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_02.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_02.json
index 72cc6dfa30..c1a3f93cd0 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_02.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_02.json
@@ -1,23 +1,18 @@
{
- "id" : "1b51f7e7-9c32-44bf-a9e8-89bc21d98852",
- "name" : "bigquery_v2_projects_test-project_jobs",
+ "id" : "4e37133b-ec5b-415f-8655-f7bb8c28f8cf",
+ "name" : "bigquery_v2_projects_test-project_jobs_job05",
"request" : {
- "url" : "/bigquery/v2/projects/test-project/jobs?prettyPrint=false",
- "method" : "POST",
- "bodyPatterns" : [ {
- "equalToJson" : "{\"configuration\":{\"query\":{\"query\":\"DELETE FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud` WHERE id='1'\",\"useLegacySql\":false}},\"jobReference\":{\"jobId\":\"job05\",\"projectId\":\"test-project\"}}",
- "ignoreArrayOrder" : true,
- "ignoreExtraElements" : true
- } ]
+ "url" : "/bigquery/v2/projects/test-project/jobs/job05?location=US&prettyPrint=false",
+ "method" : "GET"
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"iW1E4mlHOKfrold+UavMSg==\",\"id\":\"test-project:US.job05\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job05?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"DELETE FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud` WHERE id='1'\",\"destinationTable\":{\"projectId\":\"t [...]
+ "body" : "{\"kind\":\"bigquery#job\",\"etag\":\"VY37YI4G/oGX2oV9En+4mw==\",\"id\":\"test-project:US.job05\",\"selfLink\":\"https://bigquery.googleapis.com/bigquery/v2/projects/test-project/jobs/job05?location=US\",\"user_email\":\"fuse-qe-ceq-pubsub-service-acc@test-project.iam.gserviceaccount.com\",\"configuration\":{\"query\":{\"query\":\"DELETE FROM `test-project.google_bigquery_test_dataset.google_bigquery_table_for_sql_crud` WHERE id=1\",\"destinationTable\":{\"projectId\":\"tes [...]
"headers" : {
- "ETag" : "iW1E4mlHOKfrold+UavMSg==",
+ "ETag" : "VY37YI4G/oGX2oV9En+4mw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:24 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:46:56 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -26,7 +21,7 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "1b51f7e7-9c32-44bf-a9e8-89bc21d98852",
+ "uuid" : "4e37133b-ec5b-415f-8655-f7bb8c28f8cf",
"persistent" : true,
- "insertionIndex" : 85
+ "insertionIndex" : 50
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_03.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_03.json
index c2cde2ebab..2522e8012d 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_03.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_03.json
@@ -1,5 +1,5 @@
{
- "id" : "7ebc9403-fb2e-4e32-9ca0-0b581da71fb4",
+ "id" : "724130fe-905f-48f0-8156-a5d3f902c0c8",
"name" : "bigquery_v2_projects_test-project_queries_job05",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job05?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"doeBwWpe1eaj9fZgCDm9jQ==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job05\",\"location\":\"US\"},\"totalBytesProcessed\":\"19\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"ENhE3lnXNfPXy3mafLnyXw==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job05\",\"location\":\"US\"},\"totalBytesProcessed\":\"96\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "doeBwWpe1eaj9fZgCDm9jQ==",
+ "ETag" : "ENhE3lnXNfPXy3mafLnyXw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:27 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:46:56 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,9 +21,9 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "7ebc9403-fb2e-4e32-9ca0-0b581da71fb4",
+ "uuid" : "724130fe-905f-48f0-8156-a5d3f902c0c8",
"persistent" : true,
"scenarioName" : "scenario-5-bigquery-v2-projects-test-project-queries-job05",
"requiredScenarioState" : "scenario-5-bigquery-v2-projects-test-project-queries-job05-2",
- "insertionIndex" : 88
+ "insertionIndex" : 51
}
\ No newline at end of file
diff --git a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_04.json b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_04.json
index f6a6558e3c..96251efa36 100644
--- a/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_04.json
+++ b/integration-tests/google-bigquery/src/test/resources/mappings/sql_crud_job05_04.json
@@ -1,5 +1,5 @@
{
- "id" : "be7e9248-303c-41d4-84f4-4ecb863a5bf9",
+ "id" : "d00a05ad-fdc6-4ec4-918e-cf5dbef1d7df",
"name" : "bigquery_v2_projects_test-project_queries_job05",
"request" : {
"url" : "/bigquery/v2/projects/test-project/queries/job05?location=US&maxResults=0&prettyPrint=false",
@@ -7,12 +7,12 @@
},
"response" : {
"status" : 200,
- "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"doeBwWpe1eaj9fZgCDm9jQ==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"STRING\"},{\"name\":\"col1\",\"type\":\"STRING\"},{\"name\":\"col2\",\"type\":\"STRING\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job05\",\"location\":\"US\"},\"totalBytesProcessed\":\"19\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
+ "body" : "{\"kind\":\"bigquery#getQueryResultsResponse\",\"etag\":\"ENhE3lnXNfPXy3mafLnyXw==\",\"schema\":{\"fields\":[{\"name\":\"id\",\"type\":\"NUMERIC\"},{\"name\":\"col1\",\"type\":\"NUMERIC\"},{\"name\":\"col2\",\"type\":\"NUMERIC\"}]},\"jobReference\":{\"projectId\":\"test-project\",\"jobId\":\"job05\",\"location\":\"US\"},\"totalBytesProcessed\":\"96\",\"jobComplete\":true,\"cacheHit\":false,\"numDmlAffectedRows\":\"1\"}",
"headers" : {
- "ETag" : "doeBwWpe1eaj9fZgCDm9jQ==",
+ "ETag" : "ENhE3lnXNfPXy3mafLnyXw==",
"Content-Type" : "application/json; charset=UTF-8",
"Vary" : [ "Origin", "X-Origin", "Referer" ],
- "Date" : "Mon, 22 Aug 2022 07:19:26 GMT",
+ "Date" : "Fri, 04 Nov 2022 12:46:56 GMT",
"Server" : "ESF",
"Cache-Control" : "private",
"X-XSS-Protection" : "0",
@@ -21,10 +21,10 @@
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000,h3-Q050=\":443\"; ma=2592000,h3-Q046=\":443\"; ma=2592000,h3-Q043=\":443\"; ma=2592000,quic=\":443\"; ma=2592000; v=\"46,43\""
}
},
- "uuid" : "be7e9248-303c-41d4-84f4-4ecb863a5bf9",
+ "uuid" : "d00a05ad-fdc6-4ec4-918e-cf5dbef1d7df",
"persistent" : true,
"scenarioName" : "scenario-5-bigquery-v2-projects-test-project-queries-job05",
"requiredScenarioState" : "Started",
"newScenarioState" : "scenario-5-bigquery-v2-projects-test-project-queries-job05-2",
- "insertionIndex" : 86
+ "insertionIndex" : 49
}
\ No newline at end of file