Merge branch 'main' into missed-buildinfo-test

FerretDB · Dec 20, 2021 · 1d8a917 · 1d8a917
2 parents 4cbf713 + 768e3c3
commit 1d8a917
Show file tree

Hide file tree

Showing 15 changed files with 424 additions and 356 deletions.
diff --git a/.github/workflows/containers_main.yml b/.github/workflows/containers_main.yml
@@ -0,0 +1,48 @@
+---
+name: 'containers_main'
+
+on:
+  push:
+    branches:
+      - main
+
+env:
+  GOPATH: /home/runner/go
+  GOCACHE: /home/runner/go/cache
+  GOMODCACHE: /home/runner/go/cache/mod
+  GOPROXY: https://proxy.golang.org # remove direct
+
+jobs:
+  container-build:
+    name: Container build
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ferretdb-bot
+          password: ${{ secrets.FERRETDB_PACKAGES }}
+
+      - name: Setup Go
+        uses: FerretDB/github-actions/setup-go@main
+        with:
+          cache-key: test
+
+      - name: Initialize docker
+        run: make docker-init
+
+      - name: Push the continer images
+        env:
+          DOCKER_TAG: main
+        run: make docker-push
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Please use global .gitignore file for .vscode/, .idea/, etc.
+# See https://git.io/JD5Zf
+
 /bin/
 /vendor/
 cover.txt

diff --git a/cmd/envtool/main.go b/cmd/envtool/main.go
@@ -249,11 +249,8 @@ func main() {
 		logger.Fatal(err)
 	}
 
-	for _, q := range []string{
-		`CREATE SCHEMA monila`,
-		`CREATE SCHEMA test`,
-	} {
-		if _, err = pgPool.Exec(ctx, q); err != nil {
+	for _, db := range []string{`monila`, `test`} {
+		if err = pgPool.CreateSchema(ctx, db); err != nil {
 			logger.Fatal(err)
 		}
 	}

diff --git a/internal/handlers/common/error.go b/internal/handlers/common/error.go
@@ -32,6 +32,7 @@ const (
 
 	ErrBadValue          = ErrorCode(2)     // BadValue
 	ErrNamespaceNotFound = ErrorCode(26)    // NamespaceNotFound
+	ErrNamespaceExists   = ErrorCode(48)    // NamespaceExists
 	ErrCommandNotFound   = ErrorCode(59)    // CommandNotFound
 	ErrNotImplemented    = ErrorCode(238)   // NotImplemented
 	ErrRegexOptions      = ErrorCode(51075) // Location51075

diff --git a/internal/handlers/common/errorcode_string.go b/internal/handlers/common/errorcode_string.go
diff --git a/internal/handlers/handler.go b/internal/handlers/handler.go
@@ -258,7 +258,7 @@ func (h *Handler) msgStorage(ctx context.Context, msg *wire.OpMsg) (common.Stora
 		}
 		if !tableExist {
 			fields := []zap.Field{zap.String("schema", db), zap.String("table", collection)}
-			if err := shared.CreateCollection(ctx, h.pgPool, db, collection); err != nil {
+			if err := h.pgPool.CreateTable(ctx, db, collection); err != nil {
 				fields = append(fields, zap.Error(err))
 				h.l.Warn("Failed to create jsonb1 table.", fields...)
 			} else {