update db structure

fabiocolacio · Dec 8, 2018 · 7cd0a5d · 7cd0a5d
1 parent 4de47d1
commit 7cd0a5d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/api/requests.go b/api/requests.go
@@ -8,7 +8,6 @@ import(
     "io/ioutil"
     "crypto/tls"
     "net/url"
-    "log"
 )
 
 var(

diff --git a/db/db.go b/db/db.go
@@ -21,7 +21,8 @@ func init() {
 
 func InitTables() error {
     _, err := db.Exec(`CREATE TABLE keys(
-        owner INT,
+        id INT PRIMARY KEY AUTO_INCREMENT,
+        owner VARCHAR(16),
         pub BLOB,
         priv BLOB
         );`)
@@ -38,12 +39,23 @@ func ResetTables() error {
     return InitTables()
 }
 
-func LookupKey(owner int, pub []bytes) (priv []bytes, err error) {
+func LookupPubKey(owner string) (pub []bytes, err error) {
+    row := db.QueryRow(
+        `SELECT priv
+         FROM keys
+         WHERE owner = ?
+         ORDER BY id DESC`,
+        string, pub)
+    err = row.Scan(&pub)
+    return
+}
+
+func LookupPrivKey(owner string, pub []bytes) (priv []bytes, err error) {
     row := db.QueryRow(
         `SELECT priv
          FROM keys
          WHERE owner = ? AND pub = ?`,
-        owner, pub)
+        string, pub)
     err = row.Scan(&priv)
     return
 }

diff --git a/main.go b/main.go
@@ -58,6 +58,7 @@ func main() {
     // }
 
     go MessagePoll(jwt, peer, ui)
+
     ui.Callback = func(msg string) {
         err := api.MessageSend(jwt, peer, msg)
         if err != nil {