Fix syntax errors

.github/workflows/main.yml

@@ -26,11 +26,13 @@ jobs:
         with:
           go-version: 1.15
       
-      - name: Install go-bindata
+      - name: Install go-bindata and build migrations
-        run: go get -u github.com/go-bindata/go-bindata/...
+        env:
-
+          GOPATH: /home/runner/work/Geeksbot/
-      - name: Build migrations
+        run: |
-        run: go-bindata -pkg migrations -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
+            go get -u github.com/go-bindata/go-bindata/...
+            /home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
+            head $GITHUB_WORKSPACE/internal/database/migrations/bindata.go
 
       - name: Build container image
         env:

Dockerfile

@@ -8,6 +8,7 @@ RUN go mod download
 
 COPY . .
 RUN go install github.com/dustinpianalto/geeksbot/...
+RUN go get -u github.com/go-bindata/go-bindata/...
 
 CMD [ "go", "run", "cmd/geeksbot/main.go"]
 
@@ -16,5 +17,6 @@ from alpine
 WORKDIR /bin
 
 COPY --from=dev /go/bin/geeksbot ./geeksbot
+COPY --from=dev /go/bin/go-bindata ./go-bindata
 
 CMD [ "geeksbot" ]

internal/database/database.go

@@ -30,15 +30,19 @@ func ConnectDatabase(dbConnString string) {
 	db.SetConnMaxLifetime(300)
 	d, err := bindata.WithInstance(s)
 	if err != nil {
-		log.Fatal(fmt.Errorf("Cannot load migrations: %w", err))
+		log.Fatal(fmt.Errorf("cannot load migrations: %w", err))
 	}
 	instance, err := postgres.WithInstance(db, &postgres.Config{})
 	if err != nil {
-		log.Fatal(fmt.Errorf("Cannot create db driver: %w", err))
+		log.Fatal(fmt.Errorf("cannot create db driver: %w", err))
 	}
 	m, err := migrate.NewWithInstance("go-bindata", d, "postgres", instance)
 	if err != nil {
-		log.Fatal(fmt.Errorf("Cannot create migration instance: %w", err))
+		log.Fatal(fmt.Errorf("cannot create migration instance: %w", err))
 	}
-	m.Up()
+	err = m.Up()
+	if err != nil {
+		log.Fatal(fmt.Errorf("error running migrations: %w", err))
+	}
+	log.Println("Migrations Run")
 }

internal/database/migrations/000001_init_schema.up.sql

@@ -5,7 +5,7 @@ BEGIN;
         prefixes varchar(10)[],
         PRIMARY KEY(id)
     );
-    CREATE TYPE IF NOT EXISTS role_type as ENUM (
+    CREATE TYPE role_type as ENUM (
         'normal',
         'moderator',
         'admin',
@@ -25,7 +25,7 @@ BEGIN;
         id varchar(30),
         guild_id varchar(30),
         admin boolean,
-        default boolean,
+        default_channel boolean,
         new_patron boolean,
         PRIMARY KEY(id),
         CONSTRAINT fk_guild
@@ -45,7 +45,7 @@ BEGIN;
         id varchar(30),
         created_at timestamp,
         modified_at timestamp,
-        content varchar(2000)
+        content varchar(2000),
         previous_content varchar(2000)[],
         channel_id varchar(30),
         author_id varchar(30),
@@ -89,7 +89,7 @@ BEGIN;
                 REFERENCES roles(id)
                 ON DELETE SET NULL,
         CONSTRAINT fk_tier
-            FOREIGN_KEY(next_tier)
+            FOREIGN KEY(next_tier)
                 REFERENCES patreon_tier(id)
                 ON DELETE SET NULL
     );