wip

FerretDB · AlekSi · Jul 7, 2022 · Jul 5, 2022 · Jul 5, 2022 · Jul 5, 2022
commit 9a8da5ec831914189d8dd895081426411e8c361f
@@ -150,7 +150,7 @@ func TestCollectionName(t *testing.T) {
 						"and_in_ferretdb_databases_for_ferretdb_it_fails_because_it_is_more_than_119_characters__for_mongo_it_fails_because_it_is_more_than_" +
 						"255_charachters_long_that_excludes_non_latin_letters_spaces_dots_dollars_dashes Max: 255",
 				},
-				alt: "Fully qualified namespace is too long.",
+				alt: "Collection must not contain non-latin letters, spaces, dots, dollars, dashes and be shorter than 119",
 			},
 			"WithADollarSign": {
 				collection: "collection_name_with_a-$",
@@ -159,6 +159,7 @@ func TestCollectionName(t *testing.T) {
 					Code:    73,
 					Message: `Invalid collection name: collection_name_with_a-$`,
 				},
+				alt: "Collection must not contain non-latin letters, spaces, dots, dollars, dashes and be shorter than 119",
 			},
 			"Empty": {
 				collection: "",
@@ -167,7 +168,7 @@ func TestCollectionName(t *testing.T) {
 					Code:    73,
 					Message: "Invalid namespace specified 'testcollectionname-err.'",
 				},
-				alt: "Namespace is empty",
+				alt: "Collection must not contain non-latin letters, spaces, dots, dollars, dashes and be shorter than 119",
 			},
 		}
 

@@ -77,6 +77,10 @@ func (h *Handler) MsgCreate(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg,
 			msg := fmt.Sprintf("Collection already exists. NS: %s.%s", db, collection)
 			return nil, common.NewErrorMsg(common.ErrNamespaceExists, msg)
 		}
+		if err == pgdb.ErrInvalidTableName {
+			msg := "Collection must not contain non-latin letters, spaces, dots, dollars, dashes and be shorter than 119"
+			return nil, common.NewErrorMsg(common.ErrInvalidNamespace, msg)
+		}
 		return nil, lazyerrors.Error(err)
 	}
 

@@ -30,7 +30,6 @@ import (
 	"golang.org/x/exp/slices"
 
 	"github.com/FerretDB/FerretDB/internal/fjson"
-	"github.com/FerretDB/FerretDB/internal/handlers/common"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
 	"github.com/FerretDB/FerretDB/internal/util/must"
@@ -54,6 +53,9 @@ var (
 
 	// ErrAlreadyExist indicates that a schema or table already exists.
 	ErrAlreadyExist = fmt.Errorf("schema or table already exist")
+
+	// ErrInvalidTableName indicates that a schema or table didn't passed name checks.
+	ErrInvalidTableName = fmt.Errorf("invalid table name")
 )
 
 // Pool represents PostgreSQL concurrency-safe connection pool.
@@ -350,26 +352,20 @@ func (pgPool *Pool) DropDatabase(ctx context.Context, db string) error {
 // The collection name length is no longer than 119 letters.
 func (pgPool *Pool) validateCollectionName(collection string) error {
 	if len(collection) == 0 {
-		return common.NewErrorMsg(common.ErrInvalidNamespace, "Namespace is empty")
+		return ErrInvalidTableName
 	}
 
 	if len(collection) > 119 {
-		return common.NewErrorMsg(common.ErrInvalidNamespace, "Fully qualified namespace is too long.")
+		return ErrInvalidTableName
 	}
 
 	regex := regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]{0,119}$")
 	if !regex.MatchString(collection) {
-		return common.NewErrorMsg(
-			common.ErrInvalidNamespace,
-			fmt.Sprintf("Invalid collection name: %s", collection),
-		)
+		return ErrInvalidTableName
 	}
 
 	if strings.HasPrefix(collection, collectionPrefix) {
-		return common.NewErrorMsg(
-			common.ErrInvalidNamespace,
-			"Namespace must not contain start with reserved word _ferretdb_.",
-		)
+		return ErrInvalidTableName
 	}
 
 	return nil