Changeset 542 in code for trunk/db_sqlite.go


Ignore:
Timestamp:
May 26, 2021, 8:51:02 AM (4 years ago)
Author:
contact
Message:

Allow networks to be disabled

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/db_sqlite.go

    r531 r542  
    3535        sasl_external_cert BLOB DEFAULT NULL,
    3636        sasl_external_key BLOB DEFAULT NULL,
     37        enabled INTEGER NOT NULL DEFAULT 1,
    3738        FOREIGN KEY(user) REFERENCES User(id),
    3839        UNIQUE(user, addr, nick),
     
    132133        `,
    133134        "ALTER TABLE Channel ADD COLUMN detached_internal_msgid VARCHAR(255)",
     135        "ALTER TABLE Network ADD COLUMN enabled INTEGER NOT NULL DEFAULT 1",
    134136}
    135137
     
    313315        rows, err := db.db.Query(`SELECT id, name, addr, nick, username, realname, pass,
    314316                        connect_commands, sasl_mechanism, sasl_plain_username, sasl_plain_password,
    315                         sasl_external_cert, sasl_external_key
     317                        sasl_external_cert, sasl_external_key, enabled
    316318                FROM Network
    317319                WHERE user = ?`,
     
    329331                err := rows.Scan(&net.ID, &name, &net.Addr, &net.Nick, &username, &realname,
    330332                        &pass, &connectCommands, &saslMechanism, &saslPlainUsername, &saslPlainPassword,
    331                         &net.SASL.External.CertBlob, &net.SASL.External.PrivKeyBlob)
     333                        &net.SASL.External.CertBlob, &net.SASL.External.PrivKeyBlob, &net.Enabled)
    332334                if err != nil {
    333335                        return nil, err
     
    383385                        SET name = ?, addr = ?, nick = ?, username = ?, realname = ?, pass = ?, connect_commands = ?,
    384386                                sasl_mechanism = ?, sasl_plain_username = ?, sasl_plain_password = ?,
    385                                 sasl_external_cert = ?, sasl_external_key = ?
     387                                sasl_external_cert = ?, sasl_external_key = ?, enabled = ?
    386388                        WHERE id = ?`,
    387389                        netName, network.Addr, network.Nick, netUsername, realname, pass, connectCommands,
    388390                        saslMechanism, saslPlainUsername, saslPlainPassword,
    389                         network.SASL.External.CertBlob, network.SASL.External.PrivKeyBlob,
     391                        network.SASL.External.CertBlob, network.SASL.External.PrivKeyBlob, network.Enabled,
    390392                        network.ID)
    391393        } else {
     
    393395                res, err = db.db.Exec(`INSERT INTO Network(user, name, addr, nick, username,
    394396                                realname, pass, connect_commands, sasl_mechanism, sasl_plain_username,
    395                                 sasl_plain_password, sasl_external_cert, sasl_external_key)
    396                         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
     397                                sasl_plain_password, sasl_external_cert, sasl_external_key, enabled)
     398                        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
    397399                        userID, netName, network.Addr, network.Nick, netUsername, realname, pass, connectCommands,
    398400                        saslMechanism, saslPlainUsername, saslPlainPassword, network.SASL.External.CertBlob,
    399                         network.SASL.External.PrivKeyBlob)
     401                        network.SASL.External.PrivKeyBlob, network.Enabled)
    400402                if err != nil {
    401403                        return err
Note: See TracChangeset for help on using the changeset viewer.