Use cgo build flag for enabling sqlite3 driver (#18)

Author: irees

gtdb/adapter.go

@@ -1,21 +1,26 @@
 package gtdb
 
 import (
-	"strings"
+	"net/url"
 
 	sq "github.com/Masterminds/squirrel"
 	"github.com/interline-io/gotransit"
 	"github.com/jmoiron/sqlx"
 )
 
-// NewAdapter returns a Adapter for the given dburl.
-func NewAdapter(dburl string) Adapter {
-	if strings.HasPrefix(dburl, "postgres://") {
-		return &PostgresAdapter{DBURL: dburl}
-	} else if strings.HasPrefix(dburl, "sqlite3://") {
-		return &SpatiaLiteAdapter{DBURL: dburl}
+var adapters = map[string]func(string) Adapter{}
+
+// newAdapter returns a Adapter for the given dburl.
+func newAdapter(dburl string) Adapter {
+	u, err := url.Parse(dburl)
+	if err != nil {
+		return nil
+	}
+	fn, ok := adapters[u.Scheme]
+	if !ok {
+		return nil
 	}
-	return nil
+	return fn(dburl)
 }
 
 // Adapter implements details specific to each backend.

gtdb/adapter_benchmark_test.go

@@ -10,7 +10,7 @@ import (
 
 // Tests adapter Insert performance.
 func Benchmark_Adapter_Insert(b *testing.B) {
-	for k, v := range getTestAdapters() {
+	for k, v := range testAdapters {
 		b.Run(k, func(b *testing.B) {
 			adapter := v()
 			if err := adapter.Open(); err != nil {
@@ -33,7 +33,7 @@ func Benchmark_Adapter_Insert(b *testing.B) {
 
 // Tests raw database performance.
 func Benchmark_Adapter_InsertRaw(b *testing.B) {
-	for k, v := range getTestAdapters() {
+	for k, v := range testAdapters {
 		b.Run(k, func(b *testing.B) {
 			adapter := v()
 			if err := adapter.Open(); err != nil {
@@ -70,7 +70,7 @@ func Benchmark_Adapter_InsertRaw(b *testing.B) {
 // Tests multiple insert performance
 // There is a lot of setup in this test because we need a FeedVersion, Trip, and Stop
 func Benchmark_Adapter_BatchInsert(b *testing.B) {
-	for k, v := range getTestAdapters() {
+	for k, v := range testAdapters {
 		b.Run(k, func(b *testing.B) {
 			adapter := v()
 			if err := adapter.Open(); err != nil {

gtdb/adapter_test.go

@@ -2,25 +2,14 @@ package gtdb
 
 import (
 	"errors"
-	"os"
 	"strconv"
 	"testing"
 	"time"
 
 	"github.com/interline-io/gotransit"
 )
 
-func getTestAdapters() map[string]func() Adapter {
-	adapters := map[string]func() Adapter{
-		"SpatiaLiteAdapter-Memory": func() Adapter { return &SpatiaLiteAdapter{DBURL: "sqlite3://:memory:"} },
-		"SpatiaLiteAdapter-Disk":   func() Adapter { return &SpatiaLiteAdapter{DBURL: "sqlite3://test.db"} },
-	}
-	dburl := os.Getenv("GOTRANSIT_TEST_POSTGRES_URL")
-	if dburl != "" {
-		adapters["PostgresAdapter"] = func() Adapter { return &PostgresAdapter{DBURL: dburl} }
-	}
-	return adapters
-}
+var testAdapters = map[string]func() Adapter{}
 
 // Interface tests for Adapter
 func testAdapter(t *testing.T, adapter Adapter) {

gtdb/db.go

@@ -1,20 +1,8 @@
 package gtdb
 
 import (
-	"github.com/interline-io/gotransit"
-
 	// Driver
 	_ "github.com/lib/pq"
 )
 
 var bufferSize = 1000
-
-func init() {
-	// Register readers and writers
-	r := func(url string) (gotransit.Reader, error) { return NewReader(url) }
-	gotransit.RegisterReader("sqlite3", r)
-	gotransit.RegisterReader("postgres", r)
-	w := func(url string) (gotransit.Writer, error) { return NewWriter(url) }
-	gotransit.RegisterWriter("sqlite3", w)
-	gotransit.RegisterWriter("postgres", w)
-}

gtdb/postgres.go

@@ -8,6 +8,16 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
+func init() {
+	// Register driver
+	adapters["postgres"] = func(dburl string) Adapter { return &PostgresAdapter{DBURL: dburl} }
+	// Register readers and writers
+	r := func(url string) (gotransit.Reader, error) { return NewReader(url) }
+	gotransit.RegisterReader("postgres", r)
+	w := func(url string) (gotransit.Writer, error) { return NewWriter(url) }
+	gotransit.RegisterWriter("postgres", w)
+}
+
 // PostgresAdapter connects to a Postgres/PostGIS database.
 type PostgresAdapter struct {
 	DBURL string

gtdb/postgres_test.go

@@ -1,13 +1,23 @@
 package gtdb
 
 import (
+	"os"
 	"testing"
 )
 
+func init() {
+	dburl := os.Getenv("GOTRANSIT_TEST_POSTGRES_URL")
+	if dburl != "" {
+		testAdapters["PostgresAdapter"] = func() Adapter { return &PostgresAdapter{DBURL: dburl} }
+	}
+}
+
 func TestPostgresAdapter(t *testing.T) {
-	if adapter, ok := getTestAdapters()["PostgresAdapter"]; ok {
-		testAdapter(t, adapter())
-	} else {
-		t.Skip("no test url for PostgresAdapter")
+	dburl := os.Getenv("GOTRANSIT_TEST_POSTGRES_URL")
+	if dburl == "" {
+		t.Skip("GOTRANSIT_TEST_POSTGRES_URL is not set")
+		return
 	}
+	adapter := &PostgresAdapter{DBURL: dburl}
+	testAdapter(t, adapter)
 }

gtdb/reader.go

@@ -24,7 +24,7 @@ type Reader struct {
 
 // NewReader returns an initialized Reader.
 func NewReader(dburl string) (*Reader, error) {
-	return &Reader{Adapter: NewAdapter(dburl), PageSize: 1000}, nil
+	return &Reader{Adapter: newAdapter(dburl), PageSize: 1000}, nil
 }
 
 // ValidateStructure returns if all the necessary tables are present. Not implemented.

gtdb/spatialite.go

@@ -1,3 +1,5 @@
+// +build cgo
+
 package gtdb
 
 import (
@@ -13,7 +15,14 @@ import (
 
 // Register.
 func init() {
+	// Register driver and extension
+	adapters["sqlite3"] = func(dburl string) Adapter { return &SpatiaLiteAdapter{DBURL: dburl} }
 	sql.Register("spatialite", &sqlite3.SQLiteDriver{Extensions: []string{"mod_spatialite"}})
+	// Register readers and writers
+	r := func(url string) (gotransit.Reader, error) { return NewReader(url) }
+	gotransit.RegisterReader("sqlite3", r)
+	w := func(url string) (gotransit.Writer, error) { return NewWriter(url) }
+	gotransit.RegisterWriter("sqlite3", w)
 }
 
 // SpatiaLiteAdapter provides support for SpatiaLite.

gtdb/spatialite_test.go

@@ -1,13 +1,17 @@
+// +build cgo
+
 package gtdb
 
 import (
 	"testing"
 )
 
+func init() {
+	testAdapters["SpatiaLiteAdapter-Memory"] = func() Adapter { return &SpatiaLiteAdapter{DBURL: "sqlite3://:memory:"} }
+	testAdapters["SpatiaLiteAdapter-Disk"] = func() Adapter { return &SpatiaLiteAdapter{DBURL: "sqlite3://test.db"} }
+}
+
 func TestSpatiaLiteAdapter(t *testing.T) {
-	if adapter, ok := getTestAdapters()["SpatiaLiteAdapter-Memory"]; ok {
-		testAdapter(t, adapter())
-	} else {
-		t.Skip("skipping SpatiaLiteAdapter-Memory adapter tests")
-	}
+	adapter := &SpatiaLiteAdapter{DBURL: "sqlite3://:memory:"}
+	testAdapter(t, adapter)
 }

gtdb/writer.go

@@ -15,7 +15,7 @@ type Writer struct {
 
 // NewWriter returns a Writer appropriate for the given connection url.
 func NewWriter(dburl string) (*Writer, error) {
-	return &Writer{Adapter: NewAdapter(dburl)}, nil
+	return &Writer{Adapter: newAdapter(dburl)}, nil
 }
 
 // Open the database.

gtdb/writer_test.go

@@ -9,7 +9,7 @@ import (
 
 // Writer interface tests.
 func TestWriter(t *testing.T) {
-	for k, adapter := range getTestAdapters() {
+	for k, adapter := range testAdapters {
 		fe, reader := testutil.NewMinimalTestFeed()
 		t.Run(k, func(t *testing.T) {
 			testutil.TestWriter(t, *fe, func() gotransit.Reader { return reader }, func() gotransit.Writer { return &Writer{Adapter: adapter()} })