Changeset 207 in code for trunk

Timestamp:

Apr 1, 2020, 3:34:22 PM (5 years ago)

Author:

contact

Message:

Fix SQL error logged on JOIN

Closes: ​https://todo.sr.ht/~emersion/soju/40

Location:

trunk

Files:

• db.go (modified) (2 diffs)
• downstream.go (modified) (1 diff)

trunk/db.go

@@ -46 +46 @@
         Key  string
 }
+
+var ErrNoSuchChannel = fmt.Errorf("soju: no such channel")
 
 type DB struct {
@@ -266 +268 @@
 }
 
+func (db *DB) GetChannel(networkID int64, name string) (*Channel, error) {
+        db.lock.RLock()
+        defer db.lock.RUnlock()
+
+        ch := &Channel{Name: name}
+
+        var key *string
+        row := db.db.QueryRow("SELECT id, key FROM Channel WHERE network = ? AND name = ?", networkID, name)
+        if err := row.Scan(&ch.ID, &key); err == sql.ErrNoRows {
+                return nil, ErrNoSuchChannel
+        } else if err != nil {
+                return nil, err
+        }
+        ch.Key = fromStringPtr(key)
+        return ch, nil
+}
+
 func (db *DB) StoreChannel(networkID int64, ch *Channel) error {
         db.lock.Lock()

trunk/downstream.go

@@ -897 +897 @@
                         })
 
-                        err = dc.srv.db.StoreChannel(uc.network.ID, &Channel{
-                                Name: upstreamName,
-                                Key:  key,
-                        })
-                        if err != nil {
-                                dc.logger.Printf("failed to create channel %q in DB: %v", upstreamName, err)
+                        ch, err := dc.srv.db.GetChannel(uc.network.ID, upstreamName)
+                        if err == ErrNoSuchChannel {
+                                ch = &Channel{Name: upstreamName}
+                        } else if err != nil {
+                                return err
+                        }
+
+                        ch.Key = key
+
+                        if err := dc.srv.db.StoreChannel(uc.network.ID, ch); err != nil {
+                                return err
                         }
                 }