feat: Multiple schema file support in schema add

acp/acp_local.go

@@ -12,7 +12,6 @@ package acp
 
 import (
 	"context"
-	"errors"
 
 	protoTypes "github.com/cosmos/gogoproto/types"
 	"github.com/sourcenetwork/acp_core/pkg/auth"
@@ -21,6 +20,8 @@ import (
 	"github.com/sourcenetwork/acp_core/pkg/types"
 	"github.com/sourcenetwork/immutable"
 
+	"github.com/sourcenetwork/defradb/errors"
+
 	"github.com/sourcenetwork/defradb/acp/identity"
 )
 

cli/config.go

@@ -11,7 +11,6 @@
 package cli
 
 import (
-	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -20,6 +19,8 @@ import (
 	"github.com/sourcenetwork/corelog"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 const (

cli/schema_add.go

@@ -19,7 +19,7 @@ import (
 )
 
 func MakeSchemaAddCommand() *cobra.Command {
-	var schemaFile string
+	var schemaFiles []string
 	var cmd = &cobra.Command{
 		Use:   "add [schema]",
 		Short: "Add new schema",
@@ -36,40 +36,56 @@ Example: add from an argument string:
 Example: add from file:
   defradb client schema add -f schema.graphql
 
+Example: add from multiple files:
+  defradb client schema add -f schema1.graphql -f schema2.graphql
+
 Example: add from stdin:
   cat schema.graphql | defradb client schema add -
 
 Learn more about the DefraDB GraphQL Schema Language on https://docs.source.network.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			store := mustGetContextStore(cmd)
 
-			var schema string
+			var combinedSchema string
 			switch {
-			case schemaFile != "":
-				data, err := os.ReadFile(schemaFile)
-				if err != nil {
-					return err
+			case len(schemaFiles) > 0:
+				// Read schemas from files and concatenate them
+				for _, schemaFile := range schemaFiles {
+					data, err := os.ReadFile(schemaFile)
+					if err != nil {
+						return fmt.Errorf("failed to read file %s: %w", schemaFile, err)
+					}
+					combinedSchema += string(data) + "\n"
 				}
-				schema = string(data)
+
 			case len(args) > 0 && args[0] == "-":
+				// Read schema from stdin
 				data, err := io.ReadAll(cmd.InOrStdin())
 				if err != nil {
-					return err
+					return fmt.Errorf("failed to read schema from stdin: %w", err)
 				}
-				schema = string(data)
+				combinedSchema += string(data) + "\n"
+
 			case len(args) > 0:
-				schema = args[0]
+				// Read schema from argument string
+				combinedSchema += args[0] + "\n"
+
 			default:
 				return fmt.Errorf("schema cannot be empty")
 			}
 
-			cols, err := store.AddSchema(cmd.Context(), schema)
+			// Process the combined schema
+			cols, err := store.AddSchema(cmd.Context(), combinedSchema)
 			if err != nil {
+				return fmt.Errorf("failed to add schema: %w", err)
+			}
+			if err := writeJSON(cmd, cols); err != nil {
 				return err
 			}
-			return writeJSON(cmd, cols)
+
+			return nil
 		},
 	}
-	cmd.Flags().StringVarP(&schemaFile, "file", "f", "", "File to load a schema from")
+	cmd.Flags().StringSliceVarP(&schemaFiles, "file", "f", []string{}, "File(s) to load schema from")
 	return cmd
 }

crypto/nonce.go

@@ -12,10 +12,11 @@ package crypto
 
 import (
 	"crypto/rand"
-	"errors"
 	"io"
 	"os"
 	"strings"
+
+	"github.com/sourcenetwork/defradb/errors"
 )
 
 const AESNonceSize = 12

docs/website/references/cli/defradb_client_schema_add.md

@@ -17,6 +17,9 @@ Example: add from an argument string:
 Example: add from file:
   defradb client schema add -f schema.graphql
 
+Example: add from multiple files:
+  defradb client schema add -f schema1.graphql -f schema2.graphql
+
 Example: add from stdin:
   cat schema.graphql | defradb client schema add -
 
@@ -29,8 +32,8 @@ defradb client schema add [schema] [flags]
 ### Options
 
 ```
-  -f, --file string   File to load a schema from
-  -h, --help          help for add
+  -f, --file strings   File(s) to load schema from
+  -h, --help           help for add
 ```
 
 ### Options inherited from parent commands

internal/db/collection_index.go

@@ -13,7 +13,6 @@ package db
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -24,6 +23,7 @@ import (
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/client/request"
 	"github.com/sourcenetwork/defradb/datastore"
+	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/internal/db/base"
 	"github.com/sourcenetwork/defradb/internal/db/description"
 	"github.com/sourcenetwork/defradb/internal/db/fetcher"