Changeset 620 in code

Timestamp:

Oct 11, 2021, 1:21:04 PM (4 years ago)

Author:

hubert

Message:

PostgreSQL support

Location:

trunk

Files:

• cmd/soju/main.go (modified) (1 diff)
• cmd/sojuctl/main.go (modified) (1 diff)
• contrib/znc-import.go (modified) (1 diff)
• db.go (modified) (1 diff)
• db_postgres.go (added)
• db_sqlite.go (modified) (1 diff)
• doc/soju.1.scd (modified) (1 diff)
• go.mod (modified) (1 diff)
• go.sum (modified) (1 diff)
• server_test.go (modified) (1 diff)

trunk/cmd/soju/main.go

@@ -62 +62 @@
         }
 
-        db, err := soju.OpenSqliteDB(cfg.SQLDriver, cfg.SQLSource)
+        db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
         if err != nil {
                 log.Fatalf("failed to open database: %v", err)

trunk/cmd/sojuctl/main.go

@@ -44 +44 @@
         }
 
-        db, err := soju.OpenSqliteDB(cfg.SQLDriver, cfg.SQLSource)
+        db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
         if err != nil {
                 log.Fatalf("failed to open database: %v", err)

trunk/contrib/znc-import.go

@@ -62 +62 @@
         }
 
-        db, err := soju.OpenSqliteDB(cfg.SQLDriver, cfg.SQLSource)
+        db, err := soju.OpenDB(cfg.SQLDriver, cfg.SQLSource)
         if err != nil {
                 log.Fatalf("failed to open database: %v", err)

trunk/db.go

@@ -26 +26 @@
         ListDeliveryReceipts(networkID int64) ([]DeliveryReceipt, error)
         StoreClientDeliveryReceipts(networkID int64, client string, receipts []DeliveryReceipt) error
+}
+
+func OpenDB(driver, source string) (Database, error) {
+        switch driver {
+        case "sqlite3":
+                return OpenSqliteDB(source)
+        case "postgres":
+                return OpenPostgresDB(source)
+        default:
+                return nil, fmt.Errorf("unsupported database driver: %q", driver)
+        }
 }
 

trunk/db_sqlite.go

@@ -143 +143 @@
 }
 
-func OpenSqliteDB(driver, source string) (Database, error) {
-        sqlSqliteDB, err := sql.Open(driver, source)
+func OpenSqliteDB(source string) (Database, error) {
+        sqlSqliteDB, err := sql.Open("sqlite3", source)
         if err != nil {
                 return nil, err

trunk/doc/soju.1.scd

@@ -107 +107 @@
         Enable TLS support. The certificate and the key files must be PEM-encoded.
 
-*db* sqlite3 <path>
-        Set the SQLite database path (default: "soju.db" in the current directory).
+*db* <driver> <source>
+        Set the database location for user, network and channel storage. By default,
+        a _sqlite3_ database is opened in "./soju.db".
+
+        Supported drivers:
+
+        - _sqlite3_ expects _source_ to be a path to the SQLite file
+        - _postgres_ expects _source_ to be a space-separated list of _key=value_
+          parameters, e.g. _db postgres "host=/run/postgresql dbname=soju"_. Note
+          that _sslmode_ defaults to _require_. For more information on connection
+          strings, see:
+          <https://pkg.go.dev/github.com/lib/pq#hdr-Connection_String_Parameters>.
 
 *log* fs <path>

trunk/go.mod

@@ -8 +8 @@
         github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
         github.com/klauspost/compress v1.13.5 // indirect
+        github.com/lib/pq v1.10.3
         github.com/mattn/go-sqlite3 v1.14.8
         github.com/pires/go-proxyproto v0.6.1

trunk/go.sum

@@ -44 +44 @@
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg=
+github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=

trunk/server_test.go

@@ -17 +17 @@
 
 func createTempDB(t *testing.T) Database {
-        db, err := OpenSqliteDB("sqlite3", ":memory:")
+        db, err := OpenDB("sqlite3", ":memory:")
         if err != nil {
                 t.Fatalf("failed to create temporary SQLite database: %v", err)