diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-30 16:01:50 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-30 16:01:50 -0400 |
| commit | 2a0066420a9395e5fa5afcd9be4d094a48eee3fa (patch) | |
| tree | 7529650f4c78f9113ac4d9f7f307a4d92255e6cf /models | |
| parent | d0e6a4c25acc3414f6d0f93cc50e6dcb41111c19 (diff) | |
| download | gitea-2a0066420a9395e5fa5afcd9be4d094a48eee3fa.tar.gz gitea-2a0066420a9395e5fa5afcd9be4d094a48eee3fa.zip | |
Fix bug work with sqlite3
Diffstat (limited to 'models')
| -rw-r--r-- | models/access.go | 2 | ||||
| -rw-r--r-- | models/models.go | 6 | ||||
| -rw-r--r-- | models/repo.go | 2 | ||||
| -rw-r--r-- | models/user.go | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/models/access.go b/models/access.go index 84cad17a3f..42fccae055 100644 --- a/models/access.go +++ b/models/access.go @@ -26,6 +26,8 @@ type Access struct { // AddAccess adds new access record. func AddAccess(access *Access) error { + access.UserName = strings.ToLower(access.UserName) + access.RepoName = strings.ToLower(access.RepoName) _, err := orm.Insert(access) return err } diff --git a/models/models.go b/models/models.go index be176b5d39..a626b98f6e 100644 --- a/models/models.go +++ b/models/models.go @@ -12,6 +12,7 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/lunny/xorm" + // _ "github.com/mattn/go-sqlite3" "github.com/gogits/gogs/modules/base" ) @@ -23,10 +24,15 @@ var ( DbCfg struct { Type, Host, Name, User, Pwd, Path, SslMode string } + + UseSQLite3 bool ) func LoadModelsConfig() { DbCfg.Type = base.Cfg.MustValue("database", "DB_TYPE") + if DbCfg.Type == "sqlite3" { + UseSQLite3 = true + } DbCfg.Host = base.Cfg.MustValue("database", "HOST") DbCfg.Name = base.Cfg.MustValue("database", "NAME") DbCfg.User = base.Cfg.MustValue("database", "USER") diff --git a/models/repo.go b/models/repo.go index 5ca98dec0c..0c808f1845 100644 --- a/models/repo.go +++ b/models/repo.go @@ -157,7 +157,7 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv } access := Access{ - UserName: user.Name, + UserName: user.LowerName, RepoName: strings.ToLower(path.Join(user.Name, repo.Name)), Mode: AU_WRITABLE, } diff --git a/models/user.go b/models/user.go index a392fa76ba..4908552f29 100644 --- a/models/user.go +++ b/models/user.go @@ -39,6 +39,7 @@ var ( ErrUserNotExist = errors.New("User does not exist") ErrEmailAlreadyUsed = errors.New("E-mail already used") ErrUserNameIllegal = errors.New("User name contains illegal characters") + ErrKeyNotExist = errors.New("Public key does not exist") ) // User represents the object of individual and member of organization. |