diff --git a/.github/workflows/providers-sequelize-terraform.yaml b/.github/workflows/providers-sequelize-terraform.yaml index 1e3bee2..e813968 100644 --- a/.github/workflows/providers-sequelize-terraform.yaml +++ b/.github/workflows/providers-sequelize-terraform.yaml @@ -18,19 +18,19 @@ jobs: atlas: services: # Spin up a mysql:8 container to be used as the dev-database for analysis. - mysql: - image: mysql:8 + postgres: + image: postgres:15 env: - MYSQL_DATABASE: dev - MYSQL_ROOT_PASSWORD: pass + POSTGRES_DB: dev + POSTGRES_PASSWORD: pass ports: - - 3306:3306 + - 5432:5432 options: >- - --health-cmd "mysqladmin ping -ppass" + --health-cmd pg_isready --health-interval 10s --health-start-period 10s --health-timeout 5s - --health-retries 10 + --health-retries 5 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: with: dir: 'file://providers/sequelize-terraform/migrations' dir-name: 'sequelize' - dev-url: "mysql://root:pass@localhost:3306/dev" + dev-url: postgres://postgres:pass@localhost:5432/dev?sslmode=disable env: GITHUB_TOKEN: ${{ github.token }} - uses: ariga/atlas-action/migrate/push@v1 @@ -51,7 +51,4 @@ jobs: with: dir: 'file://atlashcl/gcp-secrets/migrations' dir-name: 'sequelize' - dev-url: "mysql://root:pass@localhost:3306/dev" - - - + dev-url: postgres://postgres:pass@localhost:5432/dev?sslmode=disable \ No newline at end of file diff --git a/providers/sequelize-terraform/atlas.hcl b/providers/sequelize-terraform/atlas.hcl index 203d663..e84ffa0 100644 --- a/providers/sequelize-terraform/atlas.hcl +++ b/providers/sequelize-terraform/atlas.hcl @@ -4,13 +4,13 @@ data "external_schema" "sequelize" { "@ariga/atlas-provider-sequelize", "load", "--path", "./model", - "--dialect", "mysql", // mariadb | postgres | sqlite | mssql + "--dialect", "postgres", // mariadb | postgres | sqlite | mssql ] } env "sequelize" { src = data.external_schema.sequelize.url - dev = "docker://mysql/8/dev" + dev = "docker://postgres/15/dev" migration { dir = "file://migrations" } diff --git a/providers/sequelize-terraform/migrations/20231130133839.sql b/providers/sequelize-terraform/migrations/20231130133839.sql deleted file mode 100644 index 89d838a..0000000 --- a/providers/sequelize-terraform/migrations/20231130133839.sql +++ /dev/null @@ -1,20 +0,0 @@ --- Create "Users" table -CREATE TABLE `Users` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `email` varchar(255) NOT NULL, - `createdAt` datetime NOT NULL, - `updatedAt` datetime NOT NULL, - PRIMARY KEY (`id`) -) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci; --- Create "Tasks" table -CREATE TABLE `Tasks` ( - `id` int NOT NULL AUTO_INCREMENT, - `complete` bool NULL DEFAULT 0, - `createdAt` datetime NOT NULL, - `updatedAt` datetime NOT NULL, - `userID` int NOT NULL, - PRIMARY KEY (`id`), - INDEX `userID` (`userID`), - CONSTRAINT `Tasks_ibfk_1` FOREIGN KEY (`userID`) REFERENCES `Users` (`id`) ON UPDATE CASCADE ON DELETE NO ACTION -) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci; diff --git a/providers/sequelize-terraform/migrations/20231130144552.sql b/providers/sequelize-terraform/migrations/20231130144552.sql deleted file mode 100644 index c258aa6..0000000 --- a/providers/sequelize-terraform/migrations/20231130144552.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Modify "Users" table -ALTER TABLE `Users` ADD COLUMN `hobby` varchar(255) NOT NULL; diff --git a/providers/sequelize-terraform/migrations/20231201152237.sql b/providers/sequelize-terraform/migrations/20231201152237.sql new file mode 100644 index 0000000..7558b3b --- /dev/null +++ b/providers/sequelize-terraform/migrations/20231201152237.sql @@ -0,0 +1,20 @@ +-- Create "Users" table +CREATE TABLE "public"."Users" ( + "id" serial NOT NULL, + "name" character varying(255) NOT NULL, + "email" character varying(255) NOT NULL, + "hobby" character varying(255) NOT NULL, + "createdAt" timestamptz NOT NULL, + "updatedAt" timestamptz NOT NULL, + PRIMARY KEY ("id") +); +-- Create "Tasks" table +CREATE TABLE "public"."Tasks" ( + "id" serial NOT NULL, + "complete" boolean NULL DEFAULT false, + "createdAt" timestamptz NOT NULL, + "updatedAt" timestamptz NOT NULL, + "userID" integer NOT NULL, + PRIMARY KEY ("id"), + CONSTRAINT "Tasks_userID_fkey" FOREIGN KEY ("userID") REFERENCES "public"."Users" ("id") ON UPDATE CASCADE ON DELETE NO ACTION +); diff --git a/providers/sequelize-terraform/migrations/atlas.sum b/providers/sequelize-terraform/migrations/atlas.sum index 02617e3..f772e2c 100644 --- a/providers/sequelize-terraform/migrations/atlas.sum +++ b/providers/sequelize-terraform/migrations/atlas.sum @@ -1,3 +1,2 @@ -h1:pwDJzAI2IQmaCd7lUwhKRPj/nYuN8O+eGE7BbFBkcus= -20231130133839.sql h1:MmMtplD4lbMmtYQzORgEcktY7yiMORWIbMao9BrvSP8= -20231130144552.sql h1:ZCugFXvthlNK3gDP3X2qe7TSsiQRfnn3DNyEm+abDBA= +h1:RseNocc4jAWBiVp1cMse8n9j1RGFFDBgJ7Vu7d6/lj8= +20231201152237.sql h1:7wzcw/Hqw1mXWux14NjE71rkO0bjlS/g/JSlXoxzlOY=