From f0e9874b57119d7f70e7f3fc8090bf46d5ad4a01 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 9 Jun 2021 13:01:54 +0800 Subject: [PATCH] Fix version --- dialects/postgres.go | 9 ++++++--- dialects/sqlite3.go | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dialects/postgres.go b/dialects/postgres.go index bd1c89bd..124fac80 100644 --- a/dialects/postgres.go +++ b/dialects/postgres.go @@ -804,6 +804,8 @@ func (db *postgres) Version(ctx context.Context, queryer core.Queryer) (*schemas return nil, err } + fmt.Println("---", version) + // 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") { @@ -812,11 +814,12 @@ func (db *postgres) Version(ctx context.Context, queryer core.Queryer) (*schemas Number: strings.TrimPrefix(versions[0], "v"), Edition: "CockroachDB", }, nil - } else if strings.HasPrefix(version, "Postgres:") { - versions := strings.Split(strings.TrimPrefix(version, "Postgres: "), " ") + } else if strings.HasPrefix(version, "PostgreSQL") { + versions := strings.Split(strings.TrimPrefix(version, "PostgreSQL "), " on ") return &schemas.Version{ Number: versions[0], - Edition: "Postgres", + Level: versions[1], + Edition: "PostgreSQL", }, nil } diff --git a/dialects/sqlite3.go b/dialects/sqlite3.go index 8d32ec09..a42aad48 100644 --- a/dialects/sqlite3.go +++ b/dialects/sqlite3.go @@ -176,7 +176,8 @@ func (db *sqlite3) Version(ctx context.Context, queryer core.Queryer) (*schemas. return nil, err } return &schemas.Version{ - Number: version, + Number: version, + Edition: "sqlite", }, nil }