This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica-go.git
The following commit(s) were added to refs/heads/master by this push:
new 0e75064 [CALCITE-4174] avatica-go should handle complex/long URLs
(josiahg)
0e75064 is described below
commit 0e7506499e7bf51e26f2a8e4b6eb2ad071f05df7
Author: Josiah Goodson <[email protected]>
AuthorDate: Wed Aug 12 11:39:51 2020 -0400
[CALCITE-4174] avatica-go should handle complex/long URLs (josiahg)
---
dsn.go | 3 ++-
dsn_test.go | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/dsn.go b/dsn.go
index 4d54684..32efab9 100644
--- a/dsn.go
+++ b/dsn.go
@@ -207,7 +207,8 @@ func ParseDSN(dsn string) (*Config, error) {
}
if parsed.Path != "" {
- conf.schema = strings.TrimPrefix(parsed.Path, "/")
+ s := strings.Split(parsed.Path, "/")
+ conf.schema = s[len(s)-1]
}
parsed.User = nil
diff --git a/dsn_test.go b/dsn_test.go
index e178903..95a1ee1 100644
--- a/dsn_test.go
+++ b/dsn_test.go
@@ -68,6 +68,35 @@ func TestParseDSN(t *testing.T) {
}
}
+func TestParseDSNProxy(t *testing.T) {
+
+ config, err :=
ParseDSN("http://localhost:8765/service/proxy/myschema?authentication=BASIC&avaticaUser=someuser&avaticaPassword=somepassword";)
+
+ if err != nil {
+ t.Fatalf("Unexpected error: %s", err)
+ }
+
+ if config.endpoint != "http://localhost:8765/service/proxy/myschema"; {
+ t.Errorf("Expected endpoint to be %s, got %s",
"http://localhost:8765/service/proxy/myschema";, config.endpoint)
+ }
+
+ if config.schema != "myschema" {
+ t.Errorf("Expected schema to be %s, got %s", "myschema",
config.schema)
+ }
+
+ if config.authentication != basic {
+ t.Errorf("Expected authentication to be BASIC (%d) got %d",
basic, config.authentication)
+ }
+
+ if config.avaticaUser != "someuser" {
+ t.Errorf("Expected avaticaUser to be %s, got %s", "someuser",
config.avaticaUser)
+ }
+
+ if config.avaticaPassword != "somepassword" {
+ t.Errorf("Expected avaticaPassword to be %s, got %s",
"somepassword", config.avaticaPassword)
+ }
+}
+
func TestParseEmptyDSN(t *testing.T) {
_, err := ParseDSN("")
@@ -136,6 +165,65 @@ func TestDSNDefaults(t *testing.T) {
}
}
+func TestDSNDefaultsProxy(t *testing.T) {
+
+ config, err := ParseDSN("http://localhost:8765/service/proxy/";)
+
+ if err != nil {
+ t.Fatalf("Unexpected error: %s", err)
+ }
+
+ if config.location.String() == "" {
+ t.Error("There was no timezone set.")
+ }
+
+ if config.maxRowsTotal == 0 {
+ t.Error("There was no maxRowsTotal set.")
+ }
+
+ if config.frameMaxSize == 0 {
+ t.Error("There was no fetchMaxSize set.")
+ }
+
+ if config.schema != "" {
+ t.Errorf("Unexpected schema set: %s", config.schema)
+ }
+
+ if config.transactionIsolation != 0 {
+ t.Errorf("Default transaction level should be %d, got %d.", 0,
config.transactionIsolation)
+ }
+
+ if config.authentication != none {
+ t.Errorf("Default authentication should be NONE (%d), got %d",
none, config.authentication)
+ }
+
+ if config.avaticaUser != "" {
+ t.Errorf("Default avaticaUser should be empty, got %s",
config.avaticaUser)
+ }
+
+ if config.avaticaPassword != "" {
+ t.Errorf("Default avaticaPassword should be empty, got %s",
config.avaticaPassword)
+ }
+
+ principal := krb5Principal{}
+
+ if config.principal != principal {
+ t.Errorf("Default principal should be empty, got %s",
config.principal)
+ }
+
+ if config.keytab != "" {
+ t.Errorf("Default keytab should be empty, got %s",
config.keytab)
+ }
+
+ if config.krb5Conf != "" {
+ t.Errorf("Default krb5Conf should be empty, got %s",
config.krb5Conf)
+ }
+
+ if config.krb5CredentialCache != "" {
+ t.Errorf("Default krb5CredentialCache should be empty, got %s",
config.krb5CredentialCache)
+ }
+}
+
func TestLocalLocation(t *testing.T) {
config, err := ParseDSN("http://localhost:8765?location=Local";)
