Skip to content
Snippets Groups Projects
Commit 1f10816e authored by Travis Ralston's avatar Travis Ralston
Browse files

Rename SynapseDatabase and make LocalMedia a reference

parent 548fee56
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
const selectLocalMedia = "SELECT media_id, media_type, media_length, created_ts, upload_name, user_id FROM local_media_repository;" const selectLocalMedia = "SELECT media_id, media_type, media_length, created_ts, upload_name, user_id FROM local_media_repository;"
type SynapseDatabase struct { type SynDatabase struct {
db *sql.DB db *sql.DB
statements statements statements statements
} }
...@@ -17,8 +17,8 @@ type statements struct { ...@@ -17,8 +17,8 @@ type statements struct {
selectLocalMedia *sql.Stmt selectLocalMedia *sql.Stmt
} }
func OpenDatabase(connectionString string) (*SynapseDatabase, error) { func OpenDatabase(connectionString string) (*SynDatabase, error) {
var d SynapseDatabase var d SynDatabase
var err error var err error
if d.db, err = sql.Open("postgres", connectionString); err != nil { if d.db, err = sql.Open("postgres", connectionString); err != nil {
...@@ -32,16 +32,16 @@ func OpenDatabase(connectionString string) (*SynapseDatabase, error) { ...@@ -32,16 +32,16 @@ func OpenDatabase(connectionString string) (*SynapseDatabase, error) {
return &d, nil return &d, nil
} }
func (d *SynapseDatabase) GetAllMedia() ([]LocalMedia, error) { func (d *SynDatabase) GetAllMedia() ([]*LocalMedia, error) {
rows, err := d.statements.selectLocalMedia.Query() rows, err := d.statements.selectLocalMedia.Query()
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return []LocalMedia{}, nil // no records return []*LocalMedia{}, nil // no records
} }
return nil, err return nil, err
} }
var results []LocalMedia var results []*LocalMedia
for rows.Next() { for rows.Next() {
var mediaId sql.NullString var mediaId sql.NullString
var contentType sql.NullString var contentType sql.NullString
...@@ -60,7 +60,7 @@ func (d *SynapseDatabase) GetAllMedia() ([]LocalMedia, error) { ...@@ -60,7 +60,7 @@ func (d *SynapseDatabase) GetAllMedia() ([]LocalMedia, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
results = append(results, LocalMedia{ results = append(results, &LocalMedia{
MediaId: mediaId.String, MediaId: mediaId.String,
ContentType: contentType.String, ContentType: contentType.String,
SizeBytes: sizeBytes.Int64, SizeBytes: sizeBytes.Int64,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment