Changeset 118 in code for trunk

Timestamp:

Mar 18, 2020, 11:06:48 PM (5 years ago)

Author:

delthas

Message:

schema: add Network.name

Location:

trunk

Files:

• db.go (modified) (6 diffs)
• schema.sql (modified) (1 diff)
• user.go (modified) (1 diff)

trunk/db.go

@@ -24 +24 @@
 type Network struct {
         ID       int64
+        Name     string
         Addr     string
         Nick     string
@@ -110 +111 @@
         defer db.lock.RUnlock()
 
-        rows, err := db.db.Query(`SELECT id, addr, nick, username, realname, pass,
+        rows, err := db.db.Query(`SELECT id, name, addr, nick, username, realname, pass,
                         sasl_mechanism, sasl_plain_username, sasl_plain_password
                 FROM Network
@@ -123 +124 @@
         for rows.Next() {
                 var net Network
-                var username, realname, pass *string
+                var name, username, realname, pass *string
                 var saslMechanism, saslPlainUsername, saslPlainPassword *string
-                err := rows.Scan(&net.ID, &net.Addr, &net.Nick, &username, &realname,
+                err := rows.Scan(&net.ID, &name, &net.Addr, &net.Nick, &username, &realname,
                         &pass, &saslMechanism, &saslPlainUsername, &saslPlainPassword)
                 if err != nil {
                         return nil, err
                 }
+                net.Name = fromStringPtr(name)
                 net.Username = fromStringPtr(username)
                 net.Realname = fromStringPtr(realname)
@@ -149 +151 @@
         defer db.lock.Unlock()
 
+        netName := toStringPtr(network.Name)
         netUsername := toStringPtr(network.Username)
         realname := toStringPtr(network.Realname)
@@ -166 +169 @@
         if network.ID != 0 {
                 _, err = db.db.Exec(`UPDATE Network
-                        SET addr = ?, nick = ?, username = ?, realname = ?, pass = ?,
+                        SET name = ?, addr = ?, nick = ?, username = ?, realname = ?, pass = ?,
                                 sasl_mechanism = ?, sasl_plain_username = ?, sasl_plain_password = ?
                         WHERE id = ?`,
-                        network.Addr, network.Nick, netUsername, realname, pass,
+                        netName, network.Addr, network.Nick, netUsername, realname, pass,
                         saslMechanism, saslPlainUsername, saslPlainPassword, network.ID)
         } else {
                 var res sql.Result
-                res, err = db.db.Exec(`INSERT INTO Network(user, addr, nick, username,
+                res, err = db.db.Exec(`INSERT INTO Network(user, name, addr, nick, username,
                                 realname, pass, sasl_mechanism, sasl_plain_username,
                                 sasl_plain_password)
-                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-                        username, network.Addr, network.Nick, netUsername, realname, pass,
+                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+                        username, netName, network.Addr, network.Nick, netUsername, realname, pass,
                         saslMechanism, saslPlainUsername, saslPlainPassword)
                 if err != nil {
@@ -227 +230 @@
         return err
 }
+
+func (net *Network) GetName() string {
+        if net.Name != "" {
+                return net.Name
+        }
+        return net.Addr
+}

trunk/schema.sql

@@ -6 +6 @@
 CREATE TABLE Network (
         id INTEGER PRIMARY KEY,
+        name VARCHAR(255),
         user VARCHAR(255) NOT NULL,
         addr VARCHAR(255) NOT NULL,

trunk/user.go

@@ -161 +161 @@
 func (u *user) createNetwork(addr, nick string) (*network, error) {
         network := newNetwork(u, &Network{
+                Name: addr,
                 Addr: addr,
                 Nick: nick,