xorm/xorm
xorm/xorm
64
358
Fork 207
Code Issues 373 Pull Requests 18 Actions Releases 35 Activity

Add DBVersion #1723

Merged
lunny merged 7 commits from lunny/version into master 2021-06-12 07:06:06 +00:00
Conversation 6 Commits 7 Files Changed 10 +84 -39
10 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed137cb5ac - Show all commits

2
dialects/dialect.go
View File

@ -44,7 +44,7 @@ type Dialect interface {
URI() *URI
SQLType(*schemas.Column) string
FormatBytes(b []byte) string
Version(ctx context.Context, queryer core.Queryer) (string, error)
Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error)
IsReserved(string) bool
Quoter() schemas.Quoter

21
dialects/mssql.go
View File

@ -253,24 +253,29 @@ func (db *mssql) SetParams(params map[string]string) {
}
}
func (db *mssql) Version(ctx context.Context, queryer core.Queryer) (string, error) {
rows, err := queryer.QueryContext(ctx, "SELECT @@VERSION")
func (db *mssql) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
rows, err := queryer.QueryContext(ctx,
"SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel') AS ProductLevel, SERVERPROPERTY ('edition') AS ProductEdition")
if err != nil {
return "", err
return nil, err
}
defer rows.Close()
var version string
var version, level, edition string
if !rows.Next() {
return "", errors.New("unknow version")
return nil, errors.New("unknow version")
}
if err := rows.Scan(&version); err != nil {
return "", err
if err := rows.Scan(&version, &level, &edition); err != nil {
return nil, err
}
// MSSQL: Microsoft SQL Server 2017 (RTM-CU13) (KB4466404) - 14.0.3048.4 (X64) Nov 30 2018 12:57:58 Copyright (C) 2017 Microsoft Corporation Developer Edition (64-bit) on Linux (Ubuntu 16.04.5 LTS)
return version, nil
return &schemas.Version{
Number: version,
Level: level,
Edition: edition,
}, nil
}
func (db *mssql) SQLType(c *schemas.Column) string {

31
dialects/mysql.go
View File

@ -188,25 +188,42 @@ func (db *mysql) Init(uri *URI) error {
return db.Base.Init(db, uri)
}
func (db *mysql) Version(ctx context.Context, queryer core.Queryer) (string, error) {
rows, err := queryer.QueryContext(ctx, "SELECT VERSION()")
func (db *mysql) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
rows, err := queryer.QueryContext(ctx, "SELECT @@VERSION")
if err != nil {
return "", err
return nil, err
}
defer rows.Close()
var version string
if !rows.Next() {
return "", errors.New("Unknow version")
return nil, errors.New("Unknow version")
}
if err := rows.Scan(&version); err != nil {
return "", err
return nil, err
}
// TiDB: 5.7.25-TiDB-v3.0.3
if strings.HasPrefix(version, "TiDB:") {
lunny marked this conversation as resolved Outdated
6543 commented 2021-06-10 16:04:32 +00:00
Outdated
Review
Copy Link

make sure with regex, strings.Split do have 3 items or we could get out of range exeptions

and use it to make sure its TiDB in the same time :)

make sure with regex, strings.Split do have 3 items or we could get out of range exeptions and use it to make sure its TiDB in the same time :)
lunny commented 2021-06-12 05:46:27 +00:00
Outdated
Review
Copy Link

The rule is simple, three fields with -. So I don't think we need regex here.

The rule is simple, three fields with `-`. So I don't think we need regex here.
// TiDB: 5.7.25-TiDB-v3.0.3
fields := strings.Split(strings.TrimPrefix(version, "TiDB: "), "-")
return &schemas.Version{
Number: strings.TrimPrefix(fields[2], "v"),
Level: fields[0],
Edition: fields[1],
}, nil
}
return version, nil
fields := strings.SplitN(version, "-", 2)
var edition string
if len(fields) == 2 {
edition = fields[1]
}
return &schemas.Version{
Number: fields[0],
Edition: edition,
}, nil
}
func (db *mysql) SetParams(params map[string]string) {

12
dialects/oracle.go
View File

@ -515,22 +515,24 @@ func (db *oracle) Init(uri *URI) error {
return db.Base.Init(db, uri)
}
func (db *oracle) Version(ctx context.Context, queryer core.Queryer) (string, error) {
func (db *oracle) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
rows, err := queryer.QueryContext(ctx, "select * from v$version where banner like 'Oracle%'")
if err != nil {
return "", err
return nil, err
}
defer rows.Close()
var version string
if !rows.Next() {
return "", errors.New("unknow version")
return nil, errors.New("unknow version")
}
if err := rows.Scan(&version); err != nil {
return "", err
return nil, err
}
return version, nil
return &schemas.Version{
Number: version,
}, nil
}
func (db *oracle) SQLType(c *schemas.Column) string {

27
dialects/postgres.go
View File

@ -788,32 +788,39 @@ func (db *postgres) Init(uri *URI) error {
return db.Base.Init(db, uri)
}
func (db *postgres) Version(ctx context.Context, queryer core.Queryer) (string, error) {
func (db *postgres) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
rows, err := queryer.QueryContext(ctx, "SELECT version()")
if err != nil {
return "", err
return nil, err
}
defer rows.Close()
var version string
if !rows.Next() {
return "", errors.New("Unknow version")
return nil, errors.New("Unknow version")
}
if err := rows.Scan(&version); err != nil {
return "", err
return nil, err
}
// Postgress: 9.5.22 on x86_64-pc-linux-gnu (Debian 9.5.22-1.pgdg90+1), compiled by gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, 64-bit
// Postgres: 9.5.22 on x86_64-pc-linux-gnu (Debian 9.5.22-1.pgdg90+1), compiled by gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, 64-bit
// CockroachDB CCL v19.2.4 (x86_64-unknown-linux-gnu, built
if strings.HasPrefix(version, "CockroachDB") {
} else {
versions := strings.Split(version, " ")
version = versions[0]
versions := strings.Split(strings.TrimPrefix(version, "CockroachDB CCL "), " ")
return &schemas.Version{
Number: strings.TrimPrefix(versions[0], "v"),
Edition: "CockroachDB",
}, nil
} else if strings.HasPrefix(version, "Postgres:") {
versions := strings.Split(strings.TrimPrefix(version, "Postgres: "), " ")
return &schemas.Version{
Number: versions[0],
Edition: "Postgres",
}, nil
}
return version, nil
return nil, errors.New("unknow database version")
}
func (db *postgres) getSchema() string {

12
dialects/sqlite3.go
View File

@ -160,22 +160,24 @@ func (db *sqlite3) Init(uri *URI) error {
return db.Base.Init(db, uri)
}
func (db *sqlite3) Version(ctx context.Context, queryer core.Queryer) (string, error) {
func (db *sqlite3) Version(ctx context.Context, queryer core.Queryer) (*schemas.Version, error) {
rows, err := queryer.QueryContext(ctx, "SELECT sqlite_version()")
if err != nil {
return "", err
return nil, err
}
defer rows.Close()
var version string
if !rows.Next() {
return "", errors.New("Unknow version")
return nil, errors.New("Unknow version")
}
if err := rows.Scan(&version); err != nil {
return "", err
return nil, err
}
return version, nil
return &schemas.Version{
Number: version,
}, nil
}
func (db *sqlite3) SetQuotePolicy(quotePolicy QuotePolicy) {

2
engine.go
View File

@ -926,7 +926,7 @@ func (engine *Engine) Having(conditions string) *Session {
}
// DBVersion returns the database version
func (engine *Engine) DBVersion() (string, error) {
func (engine *Engine) DBVersion() (*schemas.Version, error) {
return engine.dialect.Version(engine.defaultContext, engine.db)
}

2
integrations/engine_test.go
View File

@ -207,5 +207,5 @@ func TestDBVersion(t *testing.T) {
version, err := testEngine.DBVersion()
assert.NoError(t, err)
fmt.Println(testEngine.Dialect().URI().DBType, "version", version)
fmt.Println(testEngine.Dialect().URI().DBType, "version is", version)
}

2
interface.go
View File

@ -79,11 +79,11 @@ type EngineInterface interface {
Before(func(interface{})) *Session
Charset(charset string) *Session
DBVersion() (string, error)
ClearCache(...interface{}) error
Context(context.Context) *Session
CreateTables(...interface{}) error
DBMetas() ([]*schemas.Table, error)
DBVersion() (*schemas.Version, error)
Dialect() dialects.Dialect
DriverName() string
DropTables(...interface{}) error

12
schemas/version.go Normal file
View File

@ -0,0 +1,12 @@
// Copyright 2021 The Xorm Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package schemas
// Version represents a database version
type Version struct {
Number string // the version number which could be compared
Level string
Edition string
}