luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix panic selecting insert_at (#2009)

Browse source 
Fixes a panic at start-up for plugin + postgres/mysql. When selecting on a timestamp database type, the type of the var to scan into is different based on database type. The fix is to convert the timestamp to string within the query and scan into a string.
This commit is contained in:
Doug Lauder 2021-12-21 17:18:55 -05:00 committed by GitHub
parent 98ac0e0966
commit 2640cbd3ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/services/store/sqlstore/blocks.go
View file

@ -34,6 +34,17 @@ func (be BlockNotFoundErr) Error() string {
return fmt.Sprintf("block not found (block id: %s", be.blockID)
}
func (s *SQLStore) timestampToCharField(name string, as string) string {
switch s.dbType {
case mysqlDBType:
return fmt.Sprintf("date_format(%s, '%%Y-%%m-%%d %%H:%%i:%%S') AS %s", name, as)
case postgresDBType:
return fmt.Sprintf("to_char(%s, 'YYYY-MM-DD HH:MI:SS.MS') AS %s", name, as)
default:
return fmt.Sprintf("%s AS %s", name, as)
}
}
func (s *SQLStore) blockFields() []string {
return []string{
"id",
@ -45,7 +56,7 @@ func (s *SQLStore) blockFields() []string {
"type",
"title",
"COALESCE(fields, '{}')",
"insert_at",
s.timestampToCharField("insert_at", "insertAt"),
"create_at",
"update_at",
"delete_at",
@ -171,7 +182,7 @@ func (s *SQLStore) getSubTree3(db sq.BaseRunner, c store.Container, blockID stri
"l3.type",
"l3.title",
"l3.fields",
"l3.insert_at",
s.timestampToCharField("l3.insert_at", "insertAt"),
"l3.create_at",
"l3.update_at",
"l3.delete_at",
@ -182,7 +193,7 @@ func (s *SQLStore) getSubTree3(db sq.BaseRunner, c store.Container, blockID stri
Join(s.tablePrefix + "blocks" + " as l3 on l3.parent_id = l2.id or l3.id = l2.id").
Where(sq.Eq{"l1.id": blockID}).
Where(sq.Eq{"COALESCE(l3.workspace_id, '0')": c.WorkspaceID}).
OrderBy("l3.id, l3.insert_at")
OrderBy("l3.id, insertAt")
if opts.BeforeUpdateAt != 0 {
query = query.Where(sq.LtOrEq{"update_at": opts.BeforeUpdateAt})
@ -237,7 +248,7 @@ func (s *SQLStore) blocksFromRows(rows *sql.Rows) ([]model.Block, error) {
var block model.Block
var fieldsJSON string
var modifiedBy sql.NullString
var insertAt string
var insertAt sql.NullString
err := rows.Scan(
&block.ID,