Changeset 267 in code for trunk/db.go

Timestamp:

Apr 23, 2020, 2:36:20 PM (5 years ago)

Author:

contact

Message:

Add network.channels, remove DB.GetChannel

Store the list of configured channels in the network data structure.
This removes the need for a database lookup and will be useful for
detached channels.

File:

• trunk/db.go (modified) (2 diffs)

trunk/db.go

@@ -48 +48 @@
         Key  string
 }
-
-var ErrNoSuchChannel = fmt.Errorf("soju: no such channel")
 
 const schema = `
@@ -372 +370 @@
 }
 
-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()