Fix wrong table name (#30557) (#30652)

Backport #30557

The table name should be `oauth2_application` but `o_auth2_application`

Caused by

https://github.com/go-gitea/gitea/pull/21316/files#diff-9610efbc608a41f1f2eaff5790423f0a187906f6ff0beb23a5e8d18366cc2ccfR38

diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go
index b8f0bc12c6390cb585c2b484da4404c9942684a3..09f40af743cc54f4da5b7328084065f0df23e32b 100644 (file)
--- a/models/auth/oauth2_test.go
+++ b/models/auth/oauth2_test.go
@@ -13,8 +13,6 @@ import (
        "github.com/stretchr/testify/assert"
 )
 
-//////////////////// Application
-
 func TestOAuth2Application_GenerateClientSecret(t *testing.T) {
        assert.NoError(t, unittest.PrepareTestDatabase())
        app := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: 1})

diff --git a/models/migrations/fixtures/Test_AddConfidentialClientColumnToOAuth2ApplicationTable/o_auth2_application.yml b/models/migrations/fixtures/Test_AddConfidentialClientColumnToOAuth2ApplicationTable/o_auth2_application.yml
deleted file mode 100644 (file)
index a88c2ef..0000000
--- a/models/migrations/fixtures/Test_AddConfidentialClientColumnToOAuth2ApplicationTable/o_auth2_application.yml
+++ /dev/null
@@ -1,2 +0,0 @@
--
-  id: 1

diff --git a/models/migrations/fixtures/Test_AddConfidentialClientColumnToOAuth2ApplicationTable/oauth2_application.yml b/models/migrations/fixtures/Test_AddConfidentialClientColumnToOAuth2ApplicationTable/oauth2_application.yml
new file mode 100644 (file)
index 0000000..a88c2ef
--- /dev/null
+++ b/models/migrations/fixtures/Test_AddConfidentialClientColumnToOAuth2ApplicationTable/oauth2_application.yml
@@ -0,0 +1,2 @@
+-
+  id: 1

diff --git a/models/migrations/v1_18/v230.go b/models/migrations/v1_18/v230.go
index cf94926be17cabfb6d6acf222003a12029d2f1fd..ea5b4d02e1f2664d6314583db8e31dbe3a2e2065 100644 (file)
--- a/models/migrations/v1_18/v230.go
+++ b/models/migrations/v1_18/v230.go
@@ -9,9 +9,9 @@ import (
 
 // AddConfidentialColumnToOAuth2ApplicationTable: add ConfidentialClient column, setting existing rows to true
 func AddConfidentialClientColumnToOAuth2ApplicationTable(x *xorm.Engine) error {
-       type OAuth2Application struct {
+       type oauth2Application struct {
+               ID                 int64
                ConfidentialClient bool `xorm:"NOT NULL DEFAULT TRUE"`
        }
-
-       return x.Sync(new(OAuth2Application))
+       return x.Sync(new(oauth2Application))
 }

diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go
index 308f3a50231f6cbd277ed06c311edc3ebae54cad..40db4c2ffe20b27f9cbc38ceac10ba4781264ebc 100644 (file)
--- a/models/migrations/v1_18/v230_test.go
+++ b/models/migrations/v1_18/v230_test.go
@@ -13,12 +13,12 @@ import (
 
 func Test_AddConfidentialClientColumnToOAuth2ApplicationTable(t *testing.T) {
        // premigration
-       type OAuth2Application struct {
+       type oauth2Application struct {
                ID int64
        }
 
        // Prepare and load the testing database
-       x, deferable := base.PrepareTestEnv(t, 0, new(OAuth2Application))
+       x, deferable := base.PrepareTestEnv(t, 0, new(oauth2Application))
        defer deferable()
        if x == nil || t.Failed() {
                return
@@ -36,7 +36,7 @@ func Test_AddConfidentialClientColumnToOAuth2ApplicationTable(t *testing.T) {
        }
 
        got := []ExpectedOAuth2Application{}
-       if err := x.Table("o_auth2_application").Select("id, confidential_client").Find(&got); !assert.NoError(t, err) {
+       if err := x.Table("oauth2_application").Select("id, confidential_client").Find(&got); !assert.NoError(t, err) {
                return
        }