use explicit order for insert operations
This prevents a problem from different column orders in database tables. In particular, this occurred with the user_packets table, where the `rank` column moved up in order.
This commit is contained in:
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS certs(
|
||||
);
|
||||
|
||||
insertCert:
|
||||
INSERT INTO certs VALUES (?, ?, ?, ?, ?, ?, ?);
|
||||
INSERT INTO certs (master_key_id, rank, key_id_certifier, type, verified, creation, data) VALUES (?, ?, ?, ?, ?, ?, ?);
|
||||
|
||||
selectVerifyingCertDetails:
|
||||
SELECT master_key_id AS masterKeyId, key_id_certifier AS signerMasterKeyId, creation * 1000 AS creation
|
||||
|
||||
@@ -18,8 +18,7 @@ UPDATE key_metadata
|
||||
SET last_updated = null, seen_on_keyservers = null;
|
||||
|
||||
replaceKeyMetadata:
|
||||
REPLACE INTO key_metadata
|
||||
(master_key_id, last_updated, seen_on_keyservers) VALUES (?, ?, ?);
|
||||
REPLACE INTO key_metadata (master_key_id, last_updated, seen_on_keyservers) VALUES (?, ?, ?);
|
||||
|
||||
selectFingerprintsForKeysOlderThan:
|
||||
SELECT fingerprint
|
||||
|
||||
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS keyrings_public (
|
||||
);
|
||||
|
||||
insertKeyRingPublic:
|
||||
INSERT INTO keyrings_public VALUES (?, ?);
|
||||
INSERT INTO keyrings_public (master_key_id, key_ring_data) VALUES (?, ?);
|
||||
|
||||
selectAllMasterKeyIds:
|
||||
SELECT master_key_id
|
||||
|
||||
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS key_signatures (
|
||||
);
|
||||
|
||||
insertKeySignature:
|
||||
INSERT INTO key_signatures VALUES (?, ?);
|
||||
INSERT INTO key_signatures (master_key_id, signer_key_id) VALUES (?, ?);
|
||||
|
||||
selectMasterKeyIdsBySigner:
|
||||
SELECT master_key_id
|
||||
|
||||
@@ -24,7 +24,11 @@ CREATE TABLE IF NOT EXISTS keys (
|
||||
);
|
||||
|
||||
insertKey:
|
||||
INSERT INTO keys VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
|
||||
INSERT INTO keys (
|
||||
master_key_id, rank, key_id, key_size, key_curve_oid, algorithm, fingerprint,
|
||||
can_certify, can_sign, can_encrypt, can_authenticate,
|
||||
is_revoked, has_secret, is_secure, creation, expiry
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
|
||||
|
||||
updateHasSecretByMasterKeyId:
|
||||
UPDATE keys
|
||||
|
||||
@@ -16,7 +16,8 @@ CREATE TABLE IF NOT EXISTS user_packets(
|
||||
);
|
||||
|
||||
insertUserPacket:
|
||||
INSERT INTO user_packets VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
|
||||
INSERT INTO user_packets (master_key_id, rank, type, user_id, name, email, comment, attribute_data, is_primary, is_revoked)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
|
||||
|
||||
selectUserIdsByMasterKeyId:
|
||||
SELECT user_packets.master_key_id, user_packets.rank, user_id, name, email, comment, is_primary, is_revoked, MIN(certs.verified) AS verified_int
|
||||
|
||||
Reference in New Issue
Block a user