Update xorm to v1 (#323)

Fix limit for databases other than sqlite go mod tidy && go mod vendor Remove unneeded break statements Make everything work with the new xorm version Fix xorm logging Fix lint Fix redis init Fix using id field Fix database init for testing Change default database log level Add xorm logger Use const for postgres go mod tidy Merge branch 'master' into update/xorm # Conflicts: # go.mod # go.sum # vendor/modules.txt go mod vendor Fix loading fixtures for postgres Go mod vendor1 Update xorm to version 1 Co-authored-by: kolaente <k@knt.li> Reviewed-on: https://kolaente.dev/vikunja/api/pulls/323
2020-04-12 17:29:24 +00:00
parent 713560702b
commit d28f005552
430 changed files with 48291 additions and 99915 deletions
--- a/vendor/xorm.io/xorm/log/logger.go
+++ b/vendor/xorm.io/xorm/log/logger.go
@ -0,0 +1,217 @@
+// Copyright 2015 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package log
+
+import (
+	"fmt"
+	"io"
+	"log"
+)
+
+// LogLevel defines a log level
+type LogLevel int
+
+// enumerate all LogLevels
+const (
+	// !nashtsai! following level also match syslog.Priority value
+	LOG_DEBUG LogLevel = iota
+	LOG_INFO
+	LOG_WARNING
+	LOG_ERR
+	LOG_OFF
+	LOG_UNKNOWN
+)
+
+// default log options
+const (
+	DEFAULT_LOG_PREFIX = "[xorm]"
+	DEFAULT_LOG_FLAG   = log.Ldate | log.Lmicroseconds
+	DEFAULT_LOG_LEVEL  = LOG_DEBUG
+)
+
+// Logger is a logger interface
+type Logger interface {
+	Debug(v ...interface{})
+	Debugf(format string, v ...interface{})
+	Error(v ...interface{})
+	Errorf(format string, v ...interface{})
+	Info(v ...interface{})
+	Infof(format string, v ...interface{})
+	Warn(v ...interface{})
+	Warnf(format string, v ...interface{})
+
+	Level() LogLevel
+	SetLevel(l LogLevel)
+
+	ShowSQL(show ...bool)
+	IsShowSQL() bool
+}
+
+var _ Logger = DiscardLogger{}
+
+// DiscardLogger don't log implementation for ILogger
+type DiscardLogger struct{}
+
+// Debug empty implementation
+func (DiscardLogger) Debug(v ...interface{}) {}
+
+// Debugf empty implementation
+func (DiscardLogger) Debugf(format string, v ...interface{}) {}
+
+// Error empty implementation
+func (DiscardLogger) Error(v ...interface{}) {}
+
+// Errorf empty implementation
+func (DiscardLogger) Errorf(format string, v ...interface{}) {}
+
+// Info empty implementation
+func (DiscardLogger) Info(v ...interface{}) {}
+
+// Infof empty implementation
+func (DiscardLogger) Infof(format string, v ...interface{}) {}
+
+// Warn empty implementation
+func (DiscardLogger) Warn(v ...interface{}) {}
+
+// Warnf empty implementation
+func (DiscardLogger) Warnf(format string, v ...interface{}) {}
+
+// Level empty implementation
+func (DiscardLogger) Level() LogLevel {
+	return LOG_UNKNOWN
+}
+
+// SetLevel empty implementation
+func (DiscardLogger) SetLevel(l LogLevel) {}
+
+// ShowSQL empty implementation
+func (DiscardLogger) ShowSQL(show ...bool) {}
+
+// IsShowSQL empty implementation
+func (DiscardLogger) IsShowSQL() bool {
+	return false
+}
+
+// SimpleLogger is the default implment of ILogger
+type SimpleLogger struct {
+	DEBUG   *log.Logger
+	ERR     *log.Logger
+	INFO    *log.Logger
+	WARN    *log.Logger
+	level   LogLevel
+	showSQL bool
+}
+
+var _ Logger = &SimpleLogger{}
+
+// NewSimpleLogger use a special io.Writer as logger output
+func NewSimpleLogger(out io.Writer) *SimpleLogger {
+	return NewSimpleLogger2(out, DEFAULT_LOG_PREFIX, DEFAULT_LOG_FLAG)
+}
+
+// NewSimpleLogger2 let you customrize your logger prefix and flag
+func NewSimpleLogger2(out io.Writer, prefix string, flag int) *SimpleLogger {
+	return NewSimpleLogger3(out, prefix, flag, DEFAULT_LOG_LEVEL)
+}
+
+// NewSimpleLogger3 let you customrize your logger prefix and flag and logLevel
+func NewSimpleLogger3(out io.Writer, prefix string, flag int, l LogLevel) *SimpleLogger {
+	return &SimpleLogger{
+		DEBUG: log.New(out, fmt.Sprintf("%s [debug] ", prefix), flag),
+		ERR:   log.New(out, fmt.Sprintf("%s [error] ", prefix), flag),
+		INFO:  log.New(out, fmt.Sprintf("%s [info]  ", prefix), flag),
+		WARN:  log.New(out, fmt.Sprintf("%s [warn]  ", prefix), flag),
+		level: l,
+	}
+}
+
+// Error implement ILogger
+func (s *SimpleLogger) Error(v ...interface{}) {
+	if s.level <= LOG_ERR {
+		s.ERR.Output(2, fmt.Sprintln(v...))
+	}
+	return
+}
+
+// Errorf implement ILogger
+func (s *SimpleLogger) Errorf(format string, v ...interface{}) {
+	if s.level <= LOG_ERR {
+		s.ERR.Output(2, fmt.Sprintf(format, v...))
+	}
+	return
+}
+
+// Debug implement ILogger
+func (s *SimpleLogger) Debug(v ...interface{}) {
+	if s.level <= LOG_DEBUG {
+		s.DEBUG.Output(2, fmt.Sprintln(v...))
+	}
+	return
+}
+
+// Debugf implement ILogger
+func (s *SimpleLogger) Debugf(format string, v ...interface{}) {
+	if s.level <= LOG_DEBUG {
+		s.DEBUG.Output(2, fmt.Sprintf(format, v...))
+	}
+	return
+}
+
+// Info implement ILogger
+func (s *SimpleLogger) Info(v ...interface{}) {
+	if s.level <= LOG_INFO {
+		s.INFO.Output(2, fmt.Sprintln(v...))
+	}
+	return
+}
+
+// Infof implement ILogger
+func (s *SimpleLogger) Infof(format string, v ...interface{}) {
+	if s.level <= LOG_INFO {
+		s.INFO.Output(2, fmt.Sprintf(format, v...))
+	}
+	return
+}
+
+// Warn implement ILogger
+func (s *SimpleLogger) Warn(v ...interface{}) {
+	if s.level <= LOG_WARNING {
+		s.WARN.Output(2, fmt.Sprintln(v...))
+	}
+	return
+}
+
+// Warnf implement ILogger
+func (s *SimpleLogger) Warnf(format string, v ...interface{}) {
+	if s.level <= LOG_WARNING {
+		s.WARN.Output(2, fmt.Sprintf(format, v...))
+	}
+	return
+}
+
+// Level implement ILogger
+func (s *SimpleLogger) Level() LogLevel {
+	return s.level
+}
+
+// SetLevel implement ILogger
+func (s *SimpleLogger) SetLevel(l LogLevel) {
+	s.level = l
+	return
+}
+
+// ShowSQL implement ILogger
+func (s *SimpleLogger) ShowSQL(show ...bool) {
+	if len(show) == 0 {
+		s.showSQL = true
+		return
+	}
+	s.showSQL = show[0]
+}
+
+// IsShowSQL implement ILogger
+func (s *SimpleLogger) IsShowSQL() bool {
+	return s.showSQL
+}
--- a/vendor/xorm.io/xorm/log/logger_context.go
+++ b/vendor/xorm.io/xorm/log/logger_context.go
@ -0,0 +1,97 @@
+// Copyright 2020 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package log
+
+import (
+	"context"
+	"time"
+)
+
+// LogContext represents a log context
+type LogContext struct {
+	Ctx         context.Context
+	SQL         string        // log content or SQL
+	Args        []interface{} // if it's a SQL, it's the arguments
+	ExecuteTime time.Duration
+	Err         error // SQL executed error
+}
+
+type SQLLogger interface {
+	BeforeSQL(context LogContext) // only invoked when IsShowSQL is true
+	AfterSQL(context LogContext)  // only invoked when IsShowSQL is true
+}
+
+// ContextLogger represents a logger interface with context
+type ContextLogger interface {
+	SQLLogger
+
+	Debugf(format string, v ...interface{})
+	Errorf(format string, v ...interface{})
+	Infof(format string, v ...interface{})
+	Warnf(format string, v ...interface{})
+
+	Level() LogLevel
+	SetLevel(l LogLevel)
+
+	ShowSQL(show ...bool)
+	IsShowSQL() bool
+}
+
+var (
+	_ ContextLogger = &LoggerAdapter{}
+)
+
+// LoggerAdapter wraps a Logger interafce as LoggerContext interface
+type LoggerAdapter struct {
+	logger Logger
+}
+
+func NewLoggerAdapter(logger Logger) ContextLogger {
+	return &LoggerAdapter{
+		logger: logger,
+	}
+}
+
+func (l *LoggerAdapter) BeforeSQL(ctx LogContext) {}
+
+func (l *LoggerAdapter) AfterSQL(ctx LogContext) {
+	if ctx.ExecuteTime > 0 {
+		l.logger.Infof("[SQL] %v %v - %v", ctx.SQL, ctx.Args, ctx.ExecuteTime)
+	} else {
+		l.logger.Infof("[SQL] %v %v", ctx.SQL, ctx.Args)
+	}
+}
+
+func (l *LoggerAdapter) Debugf(format string, v ...interface{}) {
+	l.logger.Debugf(format, v...)
+}
+
+func (l *LoggerAdapter) Errorf(format string, v ...interface{}) {
+	l.logger.Errorf(format, v...)
+}
+
+func (l *LoggerAdapter) Infof(format string, v ...interface{}) {
+	l.logger.Infof(format, v...)
+}
+
+func (l *LoggerAdapter) Warnf(format string, v ...interface{}) {
+	l.logger.Warnf(format, v...)
+}
+
+func (l *LoggerAdapter) Level() LogLevel {
+	return l.logger.Level()
+}
+
+func (l *LoggerAdapter) SetLevel(lv LogLevel) {
+	l.logger.SetLevel(lv)
+}
+
+func (l *LoggerAdapter) ShowSQL(show ...bool) {
+	l.logger.ShowSQL(show...)
+}
+
+func (l *LoggerAdapter) IsShowSQL() bool {
+	return l.logger.IsShowSQL()
+}
--- a/vendor/xorm.io/xorm/log/syslogger.go
+++ b/vendor/xorm.io/xorm/log/syslogger.go
@ -0,0 +1,87 @@
+// Copyright 2015 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !windows,!nacl,!plan9
+
+package log
+
+import (
+	"fmt"
+	"log/syslog"
+)
+
+var _ Logger = &SyslogLogger{}
+
+// SyslogLogger will be depricated
+type SyslogLogger struct {
+	w       *syslog.Writer
+	showSQL bool
+}
+
+// NewSyslogLogger implements Logger
+func NewSyslogLogger(w *syslog.Writer) *SyslogLogger {
+	return &SyslogLogger{w: w}
+}
+
+// Debug log content as Debug
+func (s *SyslogLogger) Debug(v ...interface{}) {
+	s.w.Debug(fmt.Sprint(v...))
+}
+
+// Debugf log content as Debug and format
+func (s *SyslogLogger) Debugf(format string, v ...interface{}) {
+	s.w.Debug(fmt.Sprintf(format, v...))
+}
+
+// Error log content as Error
+func (s *SyslogLogger) Error(v ...interface{}) {
+	s.w.Err(fmt.Sprint(v...))
+}
+
+// Errorf log content as Errorf and format
+func (s *SyslogLogger) Errorf(format string, v ...interface{}) {
+	s.w.Err(fmt.Sprintf(format, v...))
+}
+
+// Info log content as Info
+func (s *SyslogLogger) Info(v ...interface{}) {
+	s.w.Info(fmt.Sprint(v...))
+}
+
+// Infof log content as Infof and format
+func (s *SyslogLogger) Infof(format string, v ...interface{}) {
+	s.w.Info(fmt.Sprintf(format, v...))
+}
+
+// Warn log content as Warn
+func (s *SyslogLogger) Warn(v ...interface{}) {
+	s.w.Warning(fmt.Sprint(v...))
+}
+
+// Warnf log content as Warnf and format
+func (s *SyslogLogger) Warnf(format string, v ...interface{}) {
+	s.w.Warning(fmt.Sprintf(format, v...))
+}
+
+// Level shows log level
+func (s *SyslogLogger) Level() LogLevel {
+	return LOG_UNKNOWN
+}
+
+// SetLevel always return error, as current log/syslog package doesn't allow to set priority level after syslog.Writer created
+func (s *SyslogLogger) SetLevel(l LogLevel) {}
+
+// ShowSQL set if logging SQL
+func (s *SyslogLogger) ShowSQL(show ...bool) {
+	if len(show) == 0 {
+		s.showSQL = true
+		return
+	}
+	s.showSQL = show[0]
+}
+
+// IsShowSQL if logging SQL
+func (s *SyslogLogger) IsShowSQL() bool {
+	return s.showSQL
+}