go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-02-23 07:26:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove unneeded column

Browse source
This commit is contained in:
Radhi Fadlillah 2018-02-01 16:39:16 +07:00
parent 7b977b3f75
commit 2a480cc4cf
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/add.go
View file

@ -58,7 +58,6 @@ func addBookmark(url, title, excerpt string, tags []string, offline bool) (err e
ImageURL: article.Meta.Image, ImageURL: article.Meta.Image,
Excerpt: article.Meta.Excerpt, Excerpt: article.Meta.Excerpt,
Author: article.Meta.Author, Author: article.Meta.Author,
Language: article.Meta.Language,
MinReadTime: article.Meta.MinReadTime, MinReadTime: article.Meta.MinReadTime,
MaxReadTime: article.Meta.MaxReadTime, MaxReadTime: article.Meta.MaxReadTime,
Content: article.Content, Content: article.Content,

10
database/sqlite.go
View file

@ -46,7 +46,6 @@ func OpenSQLiteDatabase() (*SQLiteDatabase, error) {
image_url TEXT NOT NULL DEFAULT "", image_url TEXT NOT NULL DEFAULT "",
excerpt TEXT NOT NULL DEFAULT "", excerpt TEXT NOT NULL DEFAULT "",
author TEXT NOT NULL DEFAULT "", author TEXT NOT NULL DEFAULT "",
language TEXT NOT NULL DEFAULT "",
min_read_time INTEGER NOT NULL DEFAULT 0, min_read_time INTEGER NOT NULL DEFAULT 0,
max_read_time INTEGER NOT NULL DEFAULT 0, max_read_time INTEGER NOT NULL DEFAULT 0,
modified TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP, modified TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
@ -104,14 +103,13 @@ func (db *SQLiteDatabase) SaveBookmark(bookmark model.Bookmark) (bookmarkID int6
// Save article to database // Save article to database
res := tx.MustExec(`INSERT INTO bookmark ( res := tx.MustExec(`INSERT INTO bookmark (
url, title, image_url, excerpt, author, url, title, image_url, excerpt, author,
language, min_read_time, max_read_time) min_read_time, max_read_time)
VALUES(?, ?, ?, ?, ?, ?, ?, ?)`, VALUES(?, ?, ?, ?, ?, ?, ?)`,
bookmark.URL, bookmark.URL,
bookmark.Title, bookmark.Title,
bookmark.ImageURL, bookmark.ImageURL,
bookmark.Excerpt, bookmark.Excerpt,
bookmark.Author, bookmark.Author,
bookmark.Language,
bookmark.MinReadTime, bookmark.MinReadTime,
bookmark.MaxReadTime) bookmark.MaxReadTime)
@ -207,7 +205,7 @@ func (db *SQLiteDatabase) GetBookmarks(indices ...string) ([]model.Bookmark, err
// Fetch bookmarks // Fetch bookmarks
query := `SELECT id, query := `SELECT id,
url, title, image_url, excerpt, author, url, title, image_url, excerpt, author,
language, min_read_time, max_read_time, modified min_read_time, max_read_time, modified
FROM bookmark` + whereClause FROM bookmark` + whereClause
bookmarks := []model.Bookmark{} bookmarks := []model.Bookmark{}
@ -399,7 +397,7 @@ func (db *SQLiteDatabase) SearchBookmarks(keyword string, tags ...string) ([]mod
// Search bookmarks // Search bookmarks
query := `SELECT id, query := `SELECT id,
url, title, image_url, excerpt, author, url, title, image_url, excerpt, author,
language, min_read_time, max_read_time, modified min_read_time, max_read_time, modified
FROM bookmark ` + whereClause FROM bookmark ` + whereClause
bookmarks := []model.Bookmark{} bookmarks := []model.Bookmark{}

1
model/model.go
View file

@ -12,7 +12,6 @@ type Bookmark struct {
ImageURL string `db:"image_url" json:"imageURL"` ImageURL string `db:"image_url" json:"imageURL"`
Excerpt string `db:"excerpt" json:"excerpt"` Excerpt string `db:"excerpt" json:"excerpt"`
Author string `db:"author" json:"author"` Author string `db:"author" json:"author"`
Language string `db:"language" json:"-"`
MinReadTime int `db:"min_read_time" json:"minReadTime"` MinReadTime int `db:"min_read_time" json:"minReadTime"`
MaxReadTime int `db:"max_read_time" json:"maxReadTime"` MaxReadTime int `db:"max_read_time" json:"maxReadTime"`
Modified string `db:"modified" json:"modified"` Modified string `db:"modified" json:"modified"`