mirror of
https://github.com/grafana/grafana.git
synced 2024-11-30 12:44:10 -06:00
d1c9760fa8
* add postgresql datasource * add rest of files for postgres datasource * fix timeseries query, remove unused code * consistent naming, refactoring * s/mysql/postgres/ * s/mysql/postgres/ * couple more tests * tests for more datatypes * fix macros for postgres * add __timeSec macro * add frontend for postgres datasource * adjust documentation * fix formatting * add proper plugin description * merge editor changes from mysql * port changes from mysql datasource * set proper defaultQuery for postgres * add time_sec to timeseries query accept int for value for timeseries query * revert allowing time_sec and handle int or float values as unix timestamp for "time" column * fix tslint error * handle decimal values in timeseries query * allow setting sslmode for postgres datasource * use type switch for handling data types * fix value for timeseries query * refactor timeseries queries to make them more flexible * remove debug statement from inner loop in type conversion * use plain for loop in getTypedRowData * fix timeseries queries * adjust postgres datasource to tsdb refactoring * adjust postgres datasource to frontend changes * update lib/pq to latest version * move type conversion to getTypedRowData * handle address types cidr, inet and macaddr * adjust response parser and docs for annotations * convert unknown types to string * add documentation for postgres datasource * add another example query with metric column * set more helpful default query * update help text in query editor * handle NULL in value column of timeseries query * add __timeGroup macro * add test for __timeGroup macro * document __timeGroup and set proper default query for annotations * fix typos in docs * add postgres to list of datasources * add postgres to builtInPlugins * mysql: refactoring as prep for merging postgres Refactors out the initialization of the xorm engine and the query logic for an sql data source. * mysql: rename refactoring + test update * postgres:refactor to use SqlEngine(same as mysql) Refactored to use a common base class with the MySql data source. Other changes from the original PR: - Changed time column to be time_sec to allow other time units in the future and to be the same as MySQL - Changed integration test to test the main Query method rather than the private transformToTable method - Changed the __timeSec macro name to __timeEpoch - Renamed PostgresExecutor to PostgresQueryEndpoint Fixes #9209 (the original PR) * postgres: encrypt password on config page With some other cosmetic changes to the config page: - placeholder texts - reset button for the password after it has been encrypted. - default value for the sslmode field. * postgres: change back col name to time from time_sec * postgres mysql: remove annotation title Title has been removed from annotations * postgres: fix images for docs page * postgres mysql: fix specs
126 lines
3.4 KiB
Go
126 lines
3.4 KiB
Go
package postgres
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/go-xorm/xorm"
|
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
|
"github.com/grafana/grafana/pkg/log"
|
|
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
|
|
"github.com/grafana/grafana/pkg/tsdb"
|
|
_ "github.com/lib/pq"
|
|
. "github.com/smartystreets/goconvey/convey"
|
|
)
|
|
|
|
// To run this test, remove the Skip from SkipConvey
|
|
// and set up a PostgreSQL db named grafanatest and a user/password grafanatest/grafanatest
|
|
func TestPostgres(t *testing.T) {
|
|
SkipConvey("PostgreSQL", t, func() {
|
|
x := InitPostgresTestDB(t)
|
|
|
|
endpoint := &PostgresQueryEndpoint{
|
|
sqlEngine: &tsdb.DefaultSqlEngine{
|
|
MacroEngine: NewPostgresMacroEngine(),
|
|
XormEngine: x,
|
|
},
|
|
log: log.New("tsdb.postgres"),
|
|
}
|
|
|
|
sess := x.NewSession()
|
|
defer sess.Close()
|
|
|
|
sql := `
|
|
CREATE TABLE postgres_types(
|
|
c00_smallint smallint,
|
|
c01_integer integer,
|
|
c02_bigint bigint,
|
|
|
|
c03_real real,
|
|
c04_double double precision,
|
|
c05_decimal decimal(10,2),
|
|
c06_numeric numeric(10,2),
|
|
|
|
c07_char char(10),
|
|
c08_varchar varchar(10),
|
|
c09_text text,
|
|
|
|
c10_timestamp timestamp without time zone,
|
|
c11_timestamptz timestamp with time zone,
|
|
c12_date date,
|
|
c13_time time without time zone,
|
|
c14_timetz time with time zone,
|
|
c15_interval interval
|
|
);
|
|
`
|
|
_, err := sess.Exec(sql)
|
|
So(err, ShouldBeNil)
|
|
|
|
sql = `
|
|
INSERT INTO postgres_types VALUES(
|
|
1,2,3,
|
|
4.5,6.7,1.1,1.2,
|
|
'char10','varchar10','text',
|
|
|
|
now(),now(),now(),now(),now(),'15m'::interval
|
|
);
|
|
`
|
|
_, err = sess.Exec(sql)
|
|
So(err, ShouldBeNil)
|
|
|
|
Convey("Query with Table format should map PostgreSQL column types to Go types", func() {
|
|
query := &tsdb.TsdbQuery{
|
|
Queries: []*tsdb.Query{
|
|
{
|
|
Model: simplejson.NewFromAny(map[string]interface{}{
|
|
"rawSql": "SELECT * FROM postgres_types",
|
|
"format": "table",
|
|
}),
|
|
RefId: "A",
|
|
},
|
|
},
|
|
}
|
|
|
|
resp, err := endpoint.Query(nil, nil, query)
|
|
queryResult := resp.Results["A"]
|
|
So(err, ShouldBeNil)
|
|
|
|
column := queryResult.Tables[0].Rows[0]
|
|
So(column[0].(int64), ShouldEqual, 1)
|
|
So(column[1].(int64), ShouldEqual, 2)
|
|
So(column[2].(int64), ShouldEqual, 3)
|
|
So(column[3].(float64), ShouldEqual, 4.5)
|
|
So(column[4].(float64), ShouldEqual, 6.7)
|
|
// libpq doesnt properly convert decimal, numeric and char to go types but returns []uint8 instead
|
|
// So(column[5].(float64), ShouldEqual, 1.1)
|
|
// So(column[6].(float64), ShouldEqual, 1.2)
|
|
// So(column[7].(string), ShouldEqual, "char")
|
|
So(column[8].(string), ShouldEqual, "varchar10")
|
|
So(column[9].(string), ShouldEqual, "text")
|
|
|
|
So(column[10].(time.Time), ShouldHaveSameTypeAs, time.Now())
|
|
So(column[11].(time.Time), ShouldHaveSameTypeAs, time.Now())
|
|
So(column[12].(time.Time), ShouldHaveSameTypeAs, time.Now())
|
|
So(column[13].(time.Time), ShouldHaveSameTypeAs, time.Now())
|
|
So(column[14].(time.Time), ShouldHaveSameTypeAs, time.Now())
|
|
|
|
// libpq doesnt properly convert interval to go types but returns []uint8 instead
|
|
// So(column[15].(time.Time), ShouldHaveSameTypeAs, time.Now())
|
|
})
|
|
})
|
|
}
|
|
|
|
func InitPostgresTestDB(t *testing.T) *xorm.Engine {
|
|
x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr)
|
|
|
|
// x.ShowSQL()
|
|
|
|
if err != nil {
|
|
t.Fatalf("Failed to init postgres db %v", err)
|
|
}
|
|
|
|
sqlutil.CleanDB(x)
|
|
|
|
return x
|
|
}
|