From f27358a543811c8335846871472c16d5786a9f2e Mon Sep 17 00:00:00 2001
From: Ming Deng <mindeng@ebay.com>
Date: Tue, 22 Dec 2020 22:10:26 +0800
Subject: [PATCH] Fix 4383

---
 CHANGELOG.md                    |  3 ++-
 adapter/orm/models_boot.go      |  2 +-
 adapter/orm/models_boot_test.go | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 adapter/orm/models_boot_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86b2aa2..0a3068ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
 # developing
 - Fix `unknown escape sequence` in generated code. [4385](https://github.com/beego/beego/pull/4385)
-- Using fixed name `commentRouter.go` as generated file name. [4385](https://github.com/beego/beego/pull/4385)
\ No newline at end of file
+- Using fixed name `commentRouter.go` as generated file name. [4385](https://github.com/beego/beego/pull/4385)
+- Fix 4383: ORM Adapter produces panic when using orm.RegisterModelWithPrefix. [4386](https://github.com/beego/beego/pull/4386)
\ No newline at end of file
diff --git a/adapter/orm/models_boot.go b/adapter/orm/models_boot.go
index e004f35a..678b86e6 100644
--- a/adapter/orm/models_boot.go
+++ b/adapter/orm/models_boot.go
@@ -25,7 +25,7 @@ func RegisterModel(models ...interface{}) {
 
 // RegisterModelWithPrefix register models with a prefix
 func RegisterModelWithPrefix(prefix string, models ...interface{}) {
-	orm.RegisterModelWithPrefix(prefix, models)
+	orm.RegisterModelWithPrefix(prefix, models...)
 }
 
 // RegisterModelWithSuffix register models with a suffix
diff --git a/adapter/orm/models_boot_test.go b/adapter/orm/models_boot_test.go
new file mode 100644
index 00000000..37dbfabd
--- /dev/null
+++ b/adapter/orm/models_boot_test.go
@@ -0,0 +1,30 @@
+// Copyright 2020 beego
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package orm
+
+import (
+	"testing"
+)
+
+type User struct {
+	Id int
+}
+
+type Seller struct {
+	Id int
+}
+func TestRegisterModelWithPrefix(t *testing.T) {
+	RegisterModelWithPrefix("test", &User{}, &Seller{})
+}