1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff --git a/pkg/db/postgres/storage.go b/pkg/db/postgres/storage.go
index 4b2c307..6d1fe59 100644
--- a/pkg/db/postgres/storage.go
+++ b/pkg/db/postgres/storage.go
@@ -12,7 +12,7 @@ import (
"slices"
- "github.com/lib/pq"
+ _ "github.com/lib/pq"
"github.com/picosh/pico/pkg/db"
"github.com/picosh/utils"
)
@@ -1799,11 +1799,11 @@ func (me *PsqlDB) findPagesStats(userID string) (*db.UserServiceStats, error) {
func (me *PsqlDB) InsertTunsEventLog(log *db.TunsEventLog) error {
_, err := me.Db.Exec(
`INSERT INTO tuns_event_logs
- (user_id, server_id, remote_addr, event_type, tunnel_type, connection_type, tunnel_addrs)
+ (user_id, server_id, remote_addr, event_type, tunnel_type, connection_type, connection_id)
VALUES
($1, $2, $3, $4, $5, $6, $7)`,
log.UserId, log.ServerID, log.RemoteAddr, log.EventType, log.TunnelType,
- log.ConnectionType, pq.Array(log.TunnelAddrs),
+ log.ConnectionType, log.ConnectionID,
)
return err
}
@@ -1812,8 +1812,8 @@ func (me *PsqlDB) FindTunsEventLogsByAddr(userID, addr string) ([]*db.TunsEventL
logs := []*db.TunsEventLog{}
fmt.Println(addr)
rs, err := me.Db.Query(
- `SELECT id, user_id, server_id, remote_addr, event_type, tunnel_type, connection_type, tunnel_addrs, created_at
- FROM tuns_event_logs WHERE user_id=$1 AND tunnel_addrs @> ARRAY[$2] ORDER BY created_at DESC`, userID, addr)
+ `SELECT id, user_id, server_id, remote_addr, event_type, tunnel_type, connection_type, connection_id, created_at
+ FROM tuns_event_logs WHERE user_id=$1 AND connection_id=$2 ORDER BY created_at DESC`, userID, addr)
if err != nil {
return nil, err
}
@@ -1823,7 +1823,7 @@ func (me *PsqlDB) FindTunsEventLogsByAddr(userID, addr string) ([]*db.TunsEventL
err := rs.Scan(
&log.ID, &log.UserId, &log.ServerID, &log.RemoteAddr,
&log.EventType, &log.TunnelType, &log.ConnectionType,
- (*pq.StringArray)(&log.TunnelAddrs), &log.CreatedAt,
+ &log.ConnectionID, &log.CreatedAt,
)
if err != nil {
return nil, err
@@ -1841,7 +1841,7 @@ func (me *PsqlDB) FindTunsEventLogsByAddr(userID, addr string) ([]*db.TunsEventL
func (me *PsqlDB) FindTunsEventLogs(userID string) ([]*db.TunsEventLog, error) {
logs := []*db.TunsEventLog{}
rs, err := me.Db.Query(
- `SELECT id, user_id, server_id, remote_addr, event_type, tunnel_type, connection_type, tunnel_addrs, created_at
+ `SELECT id, user_id, server_id, remote_addr, event_type, tunnel_type, connection_type, connection_id, created_at
FROM tuns_event_logs WHERE user_id=$1 ORDER BY created_at DESC`, userID)
if err != nil {
return nil, err
@@ -1852,7 +1852,7 @@ func (me *PsqlDB) FindTunsEventLogs(userID string) ([]*db.TunsEventLog, error) {
err := rs.Scan(
&log.ID, &log.UserId, &log.ServerID, &log.RemoteAddr,
&log.EventType, &log.TunnelType, &log.ConnectionType,
- (*pq.StringArray)(&log.TunnelAddrs), &log.CreatedAt,
+ &log.ConnectionID, &log.CreatedAt,
)
if err != nil {
return nil, err
|