all under internal/integration

Author: wangzuo

.github/workflows/integration.yml renamed to .github/workflows/client.yml

@@ -1,4 +1,4 @@
-name: integration
+name: client
 on:
   push:
     paths-ignore:
@@ -56,18 +56,18 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: postgresql://postgres:postgres@localhost:5432/queryx_test?sslmode=disable
         run: |
-          cd internal/integration
+          cd internal/integration/client
           queryx db:migrate --schema postgresql.hcl
           queryx db:migrate --schema postgresql.hcl
           queryx generate --schema postgresql.hcl
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           args: --timeout=3m
-          working-directory: internal/integration/db
+          working-directory: internal/integration/client/db
       - name: go test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           go test -v ./...
   postgresql-typescript:
     needs: [build]
@@ -98,21 +98,17 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: postgresql://postgres:postgres@localhost:5432/queryx_test?sslmode=disable
         run: |
-          cd internal/integration
+          cd internal/integration/client
           queryx db:migrate --schema postgresql.hcl
           queryx generate --schema postgresql.hcl
       - name: yarn install
         run: |
-          cd internal/integration
+          cd internal/integration/client
           yarn install
       - name: yarn test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           yarn test
-      # - name: yarn tsc
-      #   run: |
-      #     cd internal/integration
-      #     yarn tsc
   mysql-golang:
     needs: [build]
     runs-on: ubuntu-latest
@@ -142,18 +138,18 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: mysql://root:@localhost:3306/queryx_test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           queryx db:migrate --schema mysql.hcl
           queryx db:migrate --schema mysql.hcl
           queryx generate --schema mysql.hcl
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           args: --timeout=3m
-          working-directory: internal/integration/db
+          working-directory: internal/integration/client/db
       - name: go test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           go test -v ./...
   mysql-typescript:
     needs: [build]
@@ -184,21 +180,17 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: mysql://root:@localhost:3306/queryx_test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           queryx db:migrate --schema mysql.hcl
           queryx generate --schema mysql.hcl
       - name: yarn install
         run: |
-          cd internal/integration
+          cd internal/integration/client
           yarn install
       - name: yarn test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           yarn test
-      # - name: yarn tsc
-      #   run: |
-      #     cd internal/integration
-      #     yarn tsc
   sqlite-golang:
     needs: [build]
     runs-on: ubuntu-latest
@@ -214,18 +206,18 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: sqlite:test.sqlite3
         run: |
-          cd internal/integration
+          cd internal/integration/client
           queryx db:migrate --schema sqlite.hcl
           queryx db:migrate --schema sqlite.hcl
           queryx generate --schema sqlite.hcl
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           args: --timeout=3m
-          working-directory: internal/integration/db
+          working-directory: internal/integration/client/db
       - name: go test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           go test -v ./...
   sqlite-typescript:
     needs: [build]
@@ -242,18 +234,14 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: sqlite:test.sqlite3
         run: |
-          cd internal/integration
+          cd internal/integration/client
           queryx db:migrate --schema sqlite.hcl
           queryx generate --schema sqlite.hcl
       - name: yarn install
         run: |
-          cd internal/integration
+          cd internal/integration/client
           yarn install
       - name: yarn test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           yarn test
-      # - name: yarn tsc
-      #   run: |
-      #     cd internal/integration
-      #     yarn tsc

.github/workflows/migrate.yml

@@ -32,17 +32,17 @@ jobs:
       - run: chmod a+x /usr/local/bin/queryx
       - name: migrate
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           queryx db:migrate --schema sqlite1.hcl
       - name: sleep
         run: sleep 1 # so the generated migration files have non-conflicting filenames
       - name: migrate again
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           queryx db:migrate --schema sqlite2.hcl
       - name: test
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           sqlite3 test.sqlite3 "insert into users(name, email) values('test', '[email protected]')"
   postgresql:
     needs: [build]
@@ -73,13 +73,13 @@ jobs:
       - run: chmod a+x /usr/local/bin/queryx
       - name: migrate
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           queryx db:migrate --schema postgresql1.hcl
       - name: sleep
         run: sleep 1
       - name: migrate again
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           queryx db:migrate --schema postgresql2.hcl
       - name: test
         run: |
@@ -113,13 +113,13 @@ jobs:
       - run: chmod a+x /usr/local/bin/queryx
       - name: migrate
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           queryx db:migrate --schema mysql1.hcl
       - name: sleep
         run: sleep 1
       - name: migrate again
         run: |
-          cd internal/migrate
+          cd internal/integration/migrate
           queryx db:migrate --schema mysql2.hcl
       - name: test
         run: |

.github/workflows/postgresql.yml

@@ -1,4 +1,4 @@
-name: integration/postgresql
+name: postgresql
 on:
   push:
     paths-ignore:

.github/workflows/windows.yml

@@ -21,11 +21,11 @@ jobs:
           QUERYX_ENV: test
           DATABASE_URL: sqlite:test.sqlite3
         run: |
-          cd internal/integration
+          cd internal/integration/client
           ..\..\queryx.exe db:migrate --schema sqlite.hcl
           ..\..\queryx.exe db:migrate --schema sqlite.hcl
           ..\..\queryx.exe generate --schema sqlite.hcl
       - name: go test
         run: |
-          cd internal/integration
+          cd internal/integration/client
           go test -v ./...

.gitignore

@@ -1,4 +1,4 @@
-internal/integration/db
+internal/integration/client/db
 internal/integration/postgresql/db
 internal/migrate/db
 node_modules