From 617464d80baee4d97cf1489d18ab9f65840ecb6a Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Tue, 3 May 2022 23:12:25 +0000 Subject: [PATCH 1/3] temp: CockroachDB image beta.5 --- .github/workflows/migration-engine.yml | 2 +- Makefile | 8 ++++---- docker-compose.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/migration-engine.yml b/.github/workflows/migration-engine.yml index b0690e6658b2..772615891739 100644 --- a/.github/workflows/migration-engine.yml +++ b/.github/workflows/migration-engine.yml @@ -87,7 +87,7 @@ jobs: url: "postgresql://postgres:prisma@localhost:5435" - name: postgres14 url: "postgresql://postgres:prisma@localhost:5437" - - name: cockroach_22_1_0_alpha_1 + - name: cockroach_22_1_0_beta_5 url: "postgresql://prisma@localhost:26257" - name: sqlite url: sqlite diff --git a/Makefile b/Makefile index 102516de9358..3f078a420cfd 100644 --- a/Makefile +++ b/Makefile @@ -88,11 +88,11 @@ start-postgres14: dev-postgres14: start-postgres14 cp $(CONFIG_PATH)/postgres14 $(CONFIG_FILE) -start-cockroach_22_1_0_alpha_1: - docker-compose -f docker-compose.yml up -d --remove-orphans cockroach_22_1_0_alpha_1 +start-cockroach_22_1_0_beta_5: + docker-compose -f docker-compose.yml up -d --remove-orphans cockroach_22_1_0_beta_5 -dev-cockroach_22_1_0_alpha_1: start-cockroach_22_1_0_alpha_1 - cp $(CONFIG_PATH)/cockroach_22_1_0_alpha_1 $(CONFIG_FILE) +dev-cockroach_22_1_0_beta_5: start-cockroach_22_1_0_beta_5 + cp $(CONFIG_PATH)/cockroach_22_1_0_beta_5 $(CONFIG_FILE) start-cockroach_21_2_0_patched: docker-compose -f docker-compose.yml up -d --remove-orphans cockroach_21_2_0_patched diff --git a/docker-compose.yml b/docker-compose.yml index 86b4335739d4..768b537ff67d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: - cockroach_22_1_0_alpha_1: - image: prismagraphql/cockroachdb-custom:22.1.0-alpha.1 + cockroach_22_1_0_beta_5: + image: prismagraphql/cockroachdb-custom:22.1.0-beta.5 restart: always command: start-single-node --insecure ports: From bd1ee09938672461ad11949800c49cc18ffde6c8 Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Wed, 4 May 2022 01:32:43 +0200 Subject: [PATCH 2/3] update snapshot --- .../tests/migrations/cockroachdb/failure_modes.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs b/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs index 54892d874f9c..ba5039619f5a 100644 --- a/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs +++ b/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs @@ -198,7 +198,7 @@ fn syntax_errors_return_error_position(api: TestApi) { ^ HINT: try \h CREATE TABLE - DbError { severity: "ERROR", parsed_severity: None, code: SqlState("42601"), message: "at or near \"is_good_dog\": syntax error", detail: Some("source SQL:\nCREATE TABLE \"Dog\" (\n id SERIAL PRIMARY KEY,\n name TEXT NOT NULL\n is_good_dog BOOLEAN NOT NULL DEFAULT TRUE\n ^"), hint: Some("try \\h CREATE TABLE"), position: None, where_: None, schema: None, table: None, column: None, datatype: None, constraint: None, file: Some("lexer.go"), line: Some(246), routine: Some("Error") } + DbError { severity: "ERROR", parsed_severity: None, code: SqlState("42601"), message: "at or near \"is_good_dog\": syntax error", detail: Some("source SQL:\nCREATE TABLE \"Dog\" (\n id SERIAL PRIMARY KEY,\n name TEXT NOT NULL\n is_good_dog BOOLEAN NOT NULL DEFAULT TRUE\n ^"), hint: Some("try \\h CREATE TABLE"), position: None, where_: None, schema: None, table: None, column: None, datatype: None, constraint: None, file: Some("lexer.go"), line: Some(251), routine: Some("Error") } 0: sql_migration_connector::apply_migration::apply_script with migration_name=" 0" From 9d9ebe99a33ac0eafbea7652bc57b9a8956bd8cd Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Thu, 5 May 2022 10:56:47 +0200 Subject: [PATCH 3/3] snapshot again --- .../tests/migrations/cockroachdb/failure_modes.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs b/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs index 41afcaaa10c1..040180ac6c60 100644 --- a/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs +++ b/migration-engine/migration-engine-tests/tests/migrations/cockroachdb/failure_modes.rs @@ -198,7 +198,7 @@ fn syntax_errors_return_error_position(api: TestApi) { ^ HINT: try \h CREATE TABLE - DbError { severity: "ERROR", parsed_severity: None, code: SqlState(E42601), message: "at or near \"is_good_dog\": syntax error", detail: Some("source SQL:\nCREATE TABLE \"Dog\" (\n id SERIAL PRIMARY KEY,\n name TEXT NOT NULL\n is_good_dog BOOLEAN NOT NULL DEFAULT TRUE\n ^"), hint: Some("try \\h CREATE TABLE"), position: None, where_: None, schema: None, table: None, column: None, datatype: None, constraint: None, file: Some("lexer.go"), line: Some(246), routine: Some("Error") } + DbError { severity: "ERROR", parsed_severity: None, code: SqlState(E42601), message: "at or near \"is_good_dog\": syntax error", detail: Some("source SQL:\nCREATE TABLE \"Dog\" (\n id SERIAL PRIMARY KEY,\n name TEXT NOT NULL\n is_good_dog BOOLEAN NOT NULL DEFAULT TRUE\n ^"), hint: Some("try \\h CREATE TABLE"), position: None, where_: None, schema: None, table: None, column: None, datatype: None, constraint: None, file: Some("lexer.go"), line: Some(251), routine: Some("Error") } 0: sql_migration_connector::apply_migration::apply_script with migration_name=" 0"