Allow multiple queries to create a db

go-kivik · Feb 11, 2024 · b3c84ac · b3c84ac
1 parent 7b93e12
commit b3c84ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/x/sqlite/schema.go b/x/sqlite/schema.go
@@ -12,14 +12,14 @@
 
 package sqlite
 
-const (
-	schema = `CREATE TABLE %q (
+var schema = []string{
+	`CREATE TABLE %q (
 		seq INTEGER PRIMARY KEY,
 		id TEXT NOT NULL,
 		rev_id INTEGER NOT NULL DEFAULT 1,
 		rev TEXT NOT NULL,
 		doc BLOB NOT NULL,
 		deleted BOOLEAN NOT NULL DEFAULT FALSE,
 		UNIQUE(id, rev_id, rev)
-	)`
-)
+	)`,
+}
diff --git a/x/sqlite/sqlite.go b/x/sqlite/sqlite.go
@@ -115,17 +115,25 @@ func (c *client) CreateDB(ctx context.Context, name string, _ driver.Options) er
 	if !validDBNameRE.MatchString(name) {
 		return &internal.Error{Status: http.StatusBadRequest, Message: "invalid database name"}
 	}
-	_, err := c.db.ExecContext(ctx, fmt.Sprintf(schema, name))
-	if err == nil {
-		return nil
+	tx, err := c.db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
 	}
-	sqliteErr := new(sqlite.Error)
-	if errors.As(err, &sqliteErr) &&
-		sqliteErr.Code() == codeSQLiteError &&
-		strings.Contains(sqliteErr.Error(), "already exists") {
-		return &internal.Error{Status: http.StatusPreconditionFailed, Message: "database already exists"}
+	defer tx.Rollback()
+	for _, query := range schema {
+		_, err := tx.ExecContext(ctx, fmt.Sprintf(query, name))
+		if err == nil {
+			continue
+		}
+		sqliteErr := new(sqlite.Error)
+		if errors.As(err, &sqliteErr) &&
+			sqliteErr.Code() == codeSQLiteError &&
+			strings.Contains(sqliteErr.Error(), "already exists") {
+			return &internal.Error{Status: http.StatusPreconditionFailed, Message: "database already exists"}
+		}
+		return err
 	}
-	return err
+	return tx.Commit()
 }
 
 func (c *client) DestroyDB(ctx context.Context, name string, _ driver.Options) error {