From 2dc9fc1626507bb54417fc4a1920b847cafb27a2 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 25 Aug 2021 15:34:33 +0200
Subject: Pg to bun (#148)

* start moving to bun

* changing more stuff

* more

* and yet more

* tests passing

* seems stable now

* more big changes

* small fix

* little fixes
---
 internal/gtsmodel/domainblock.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'internal/gtsmodel/domainblock.go')

diff --git a/internal/gtsmodel/domainblock.go b/internal/gtsmodel/domainblock.go
index 1bed86d8f..03d5ab0af 100644
--- a/internal/gtsmodel/domainblock.go
+++ b/internal/gtsmodel/domainblock.go
@@ -23,16 +23,16 @@ import "time"
 // DomainBlock represents a federation block against a particular domain
 type DomainBlock struct {
 	// ID of this block in the database
-	ID string `pg:"type:CHAR(26),pk,notnull,unique"`
+	ID string `bun:"type:CHAR(26),pk,notnull,unique"`
 	// blocked domain
-	Domain string `pg:",pk,notnull,unique"`
+	Domain string `bun:",pk,notnull,unique"`
 	// When was this block created
-	CreatedAt time.Time `pg:"type:timestamp,notnull,default:now()"`
+	CreatedAt time.Time `bun:",nullzero,notnull,default:current_timestamp"`
 	// When was this block updated
-	UpdatedAt time.Time `pg:"type:timestamp,notnull,default:now()"`
+	UpdatedAt time.Time `bun:",nullzero,notnull,default:current_timestamp"`
 	// Account ID of the creator of this block
-	CreatedByAccountID string   `pg:"type:CHAR(26),notnull"`
-	CreatedByAccount   *Account `pg:"rel:belongs-to"`
+	CreatedByAccountID string   `bun:"type:CHAR(26),notnull"`
+	CreatedByAccount   *Account `bun:"rel:belongs-to"`
 	// Private comment on this block, viewable to admins
 	PrivateComment string
 	// Public comment on this block, viewable (optionally) by everyone
@@ -40,5 +40,5 @@ type DomainBlock struct {
 	// whether the domain name should appear obfuscated when displaying it publicly
 	Obfuscate bool
 	// if this block was created through a subscription, what's the subscription ID?
-	SubscriptionID string `pg:"type:CHAR(26)"`
+	SubscriptionID string `bun:"type:CHAR(26),nullzero"`
 }
-- 
cgit v1.2.3