remove primary key id from record (#68)

xmidt-org · May 10, 2019 · 9e8990a · 9e8990a
1 parent 2a10825
commit 9e8990a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/db/db.go b/db/db.go
@@ -91,7 +91,6 @@ type Connection struct {
 }
 
 type Record struct {
-	ID        int       `json:"id"`
 	Type      EventType `json:"type" gorm:"type:int"`
 	DeviceID  string    `json:"deviceid"`
 	BirthDate int64     `json:"birthdate"`

diff --git a/db/db_test.go b/db/db_test.go
@@ -53,7 +53,6 @@ func TestGetRecords(t *testing.T) {
 			deviceID:    "1234",
 			expectedRecords: []Record{
 				{
-					ID:       1,
 					Type:     0,
 					DeviceID: "1234",
 				},
@@ -121,7 +120,6 @@ func TestGetRecordsOfType(t *testing.T) {
 			eventType:   1,
 			expectedRecords: []Record{
 				{
-					ID:       1,
 					Type:     1,
 					DeviceID: "1234",
 				},

diff --git a/deploy/docker-compose/setup_db.sh b/deploy/docker-compose/setup_db.sh
@@ -6,5 +6,5 @@ SQL="/cockroach/cockroach.sh sql $HOSTPARAMS"
 $SQL -e "CREATE USER IF NOT EXISTS roachadmin;"
 $SQL -e "CREATE DATABASE IF NOT EXISTS devices;"
 $SQL -e "GRANT ALL ON DATABASE devices TO roachadmin;"
-$SQL -e "CREATE TABLE devices.events (id BIGINT PRIMARY KEY DEFAULT unique_rowid(), type INT NOT NULL, device_id STRING NOT NULL, birth_date BIGINT NOT NULL, death_date BIGINT NOT NULL, data BYTES NOT NULL, nonce BYTES NOT NULL, alg STRING NOT NULL, kid STRING NOT NULL, INDEX idx_events_id_birth_date (device_id, birth_date DESC), INDEX idx_events_death_date (death_date DESC)) "
+$SQL -e "CREATE TABLE devices.events (type INT NOT NULL, device_id STRING NOT NULL, birth_date BIGINT NOT NULL, death_date BIGINT NOT NULL, data BYTES NOT NULL, nonce BYTES NOT NULL, alg STRING NOT NULL, kid STRING NOT NULL, INDEX idx_events_id_birth_date (device_id, birth_date DESC), INDEX idx_events_death_date (death_date DESC)) "
 $SQL -e "CREATE TABLE devices.blacklist (id STRING PRIMARY KEY, reason STRING NOT NULL);"