Changeset 146 in code for trunk/db.go

Timestamp:

Mar 25, 2020, 10:54:08 AM (5 years ago)

Author:

contact

Message:

Add support for channel keys

File:

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

trunk/db.go

@@ -36 +36 @@
         ID   int64
         Name string
+        Key  string
 }
 
@@ -194 +195 @@
         defer db.lock.RUnlock()
 
-        rows, err := db.db.Query("SELECT id, name FROM Channel WHERE network = ?", networkID)
+        rows, err := db.db.Query("SELECT id, name, key FROM Channel WHERE network = ?", networkID)
         if err != nil {
                 return nil, err
@@ -203 +204 @@
         for rows.Next() {
                 var ch Channel
-                if err := rows.Scan(&ch.ID, &ch.Name); err != nil {
+                var key *string
+                if err := rows.Scan(&ch.ID, &ch.Name, &key); err != nil {
                         return nil, err
                 }
+                ch.Key = fromStringPtr(key)
                 channels = append(channels, ch)
         }
@@ -219 +222 @@
         defer db.lock.Unlock()
 
-        _, err := db.db.Exec("INSERT OR REPLACE INTO Channel(network, name) VALUES (?, ?)", networkID, ch.Name)
+        key := toStringPtr(ch.Key)
+        _, err := db.db.Exec(`INSERT OR REPLACE INTO Channel(network, name, key)
+                VALUES (?, ?, ?)`, networkID, ch.Name, key)
         return err
 }