Skip to content

generate clikchouse fqdn in discovery #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laskoviymishka merged 2 commits into from
Mar 17, 2025
Merged

generate clikchouse fqdn in discovery #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b0430
generate clikchouse fqdn in discovery
laskoviymishka Mar 17, 2025
26ea7bd
fix
laskoviymishka Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions connectors/clickhouse/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
_ "embed"
"fmt"
"github.com/ClickHouse/clickhouse-go/v2"
"strings"

"github.com/centralmind/gateway/connectors"
Expand All @@ -20,14 +21,14 @@ import (
var docString string

func init() {
connectors.Register(func(cfg Config) (connectors.Connector, error) {
connectors.Register(func(cfg *Config) (connectors.Connector, error) {
dsn := cfg.MakeDSN()
db, err := sqlx.Open("clickhouse", dsn)
if err != nil {
return nil, xerrors.Errorf("unable to open ClickHouse db: %w", err)
}
return &Connector{
config: cfg,
config: *cfg,
db: db,
base: &connectors.BaseConnector{DB: db},
}, nil
Expand Down Expand Up @@ -66,13 +67,18 @@ func (c *Config) UnmarshalYAML(value *yaml.Node) error {
return nil
}

func (c Config) ExtraPrompt() []string {
func (c *Config) ExtraPrompt() []string {
return []string{}
}

func (c Config) MakeDSN() string {
func (c *Config) MakeDSN() string {
// If connection string is provided, use it directly
if c.ConnString != "" {
cfg, err := clickhouse.ParseDSN(c.ConnString)
if err != nil {
panic(err)
}
c.Database = cfg.Auth.Database
return c.ConnString
}

Expand All @@ -91,11 +97,11 @@ func (c Config) MakeDSN() string {
return fmt.Sprintf("%s://%s:%s@%s:%d/%s", protocol, c.User, c.Password, host, c.Port, c.Database)
}

func (c Config) Type() string {
func (c *Config) Type() string {
return "clickhouse"
}

func (c Config) Doc() string {
func (c *Config) Doc() string {
return docString
}

Expand All @@ -106,7 +112,7 @@ type Connector struct {
}

func (c Connector) Config() connectors.Config {
return c.config
return &c.config
}

func (c Connector) Sample(ctx context.Context, table model.Table) ([]map[string]any, error) {
Expand Down Expand Up @@ -154,7 +160,7 @@ func (c Connector) Discovery(ctx context.Context) ([]model.Table, error) {
}

table := model.Table{
Name: tableName,
Name: fmt.Sprintf(`"%s"."%s"`, c.config.Database, tableName),
Columns: columns,
RowCount: rowCount,
}
Expand Down