Changeset 664 in code for trunk/db_sqlite.go

Timestamp:

Nov 2, 2021, 10:33:17 PM (4 years ago)

Author:

contact

Message:

Make Network.Nick optional

Make Network.Nick optional, default to the user's username. This
will allow adding a global setting to set the nickname in the
future, just like we have for the real name.

References: ​https://todo.sr.ht/~emersion/soju/110

File:

• trunk/db_sqlite.go (modified) (5 diffs)

trunk/db_sqlite.go

@@ -29 +29 @@
         user INTEGER NOT NULL,
         addr TEXT NOT NULL,
-        nick TEXT NOT NULL,
+        nick TEXT,
         username TEXT,
         realname TEXT,
@@ -139 +139 @@
         "ALTER TABLE Network ADD COLUMN enabled INTEGER NOT NULL DEFAULT 1",
         "ALTER TABLE User ADD COLUMN realname VARCHAR(255)",
+        `
+                CREATE TABLE NetworkNew (
+                        id INTEGER PRIMARY KEY,
+                        name TEXT,
+                        user INTEGER NOT NULL,
+                        addr TEXT NOT NULL,
+                        nick TEXT,
+                        username TEXT,
+                        realname TEXT,
+                        pass TEXT,
+                        connect_commands TEXT,
+                        sasl_mechanism TEXT,
+                        sasl_plain_username TEXT,
+                        sasl_plain_password TEXT,
+                        sasl_external_cert BLOB,
+                        sasl_external_key BLOB,
+                        enabled INTEGER NOT NULL DEFAULT 1,
+                        FOREIGN KEY(user) REFERENCES User(id),
+                        UNIQUE(user, addr, nick),
+                        UNIQUE(user, name)
+                );
+                INSERT INTO NetworkNew
+                        SELECT id, name, user, addr, nick, username, realname, pass,
+                                connect_commands, sasl_mechanism, sasl_plain_username,
+                                sasl_plain_password, sasl_external_cert, sasl_external_key,
+                                enabled
+                        FROM Network;
+                DROP TABLE Network;
+                ALTER TABLE NetworkNew RENAME TO Network;
+        `,
 }
 
@@ -394 +424 @@
         for rows.Next() {
                 var net Network
-                var name, username, realname, pass, connectCommands sql.NullString
+                var name, nick, username, realname, pass, connectCommands sql.NullString
                 var saslMechanism, saslPlainUsername, saslPlainPassword sql.NullString
-                err := rows.Scan(&net.ID, &name, &net.Addr, &net.Nick, &username, &realname,
+                err := rows.Scan(&net.ID, &name, &net.Addr, &nick, &username, &realname,
                         &pass, &connectCommands, &saslMechanism, &saslPlainUsername, &saslPlainPassword,
                         &net.SASL.External.CertBlob, &net.SASL.External.PrivKeyBlob, &net.Enabled)
@@ -403 +433 @@
                 }
                 net.Name = name.String
+                net.Nick = nick.String
                 net.Username = username.String
                 net.Realname = realname.String
@@ -447 +478 @@
                 sql.Named("name", toNullString(network.Name)),
                 sql.Named("addr", network.Addr),
-                sql.Named("nick", network.Nick),
+                sql.Named("nick", toNullString(network.Nick)),
                 sql.Named("username", toNullString(network.Username)),
                 sql.Named("realname", toNullString(network.Realname)),