The update system now uses the database as the source of truth for the last version rather than lastSchema.json Refactored several structs and bits of code, so we can avoid allocations for contexts where we never use a relative time. Clicking on the relative times on the topic list and the forum page should now take you to the post on the last page rather than just the last page. Added the reltime template function. Fixed some obsolete bits of code. Fixed some spelling mistakes. Fixed a bug where MaxBytesReader was capped at the maxFileSize rather than r.ContentLength. All of the client side templates should work again now. Shortened some statement names to save some horizontal space. accUpdateBuilder and SimpleUpdate now use updatePrebuilder behind the scenes to simplify things. Renamed selectItem to builder in AccSelectBuilder. Added a Total() method to accCountBuilder to reduce the amount of boilerplate used for row count queries. The "_builder" strings have been replaced with empty strings to help save memory, to make things slightly faster and to open the door to removing the query name in many contexts down the line. Added the open_edit and close_edit client hooks. Removed many query name checks. Split the attachment logic into separate functions and de-duplicated it between replies and topics. Improved the UI for editing topics in Nox. Used type aliases to reduce the amount of boilerplate in tables.go and patches.go Reduced the amount of boilerplate in the action post logic. Eliminated a map and a slice in the topic page for users who haven't given any likes. E.g. Guests. Fixed some long out-dated parts of the update instructions. Updated the update instructions to remove mention of the obsolete lastSchema.json Fixed a bug in init.js where /api/me was being loaded for guests. Added the MiniTopicGet, GlobalCount and CountInTopic methods to AttachmentStore. Added the MiniAttachment struct. Split the mod floaters out into their own template to reduce duplication. Removed a couple of redundant ParseForms. Added the common.skipUntilIfExistsOrLine function. Added the NotFoundJS and NotFoundJSQ functions. Added the lastReplyID and attachCount columns to the topics table.
213 lines
5.0 KiB
Go
213 lines
5.0 KiB
Go
/* WIP Under Construction */
|
|
package qgen // import "github.com/Azareal/Gosora/query_gen"
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
var Registry []Adapter
|
|
var ErrNoAdapter = errors.New("This adapter doesn't exist")
|
|
|
|
type DBTableColumn struct {
|
|
Name string
|
|
Type string
|
|
Size int
|
|
Null bool
|
|
AutoIncrement bool
|
|
Default string
|
|
}
|
|
|
|
type DBTableKey struct {
|
|
Columns string
|
|
Type string
|
|
}
|
|
|
|
type DBSelect struct {
|
|
Table string
|
|
Columns string
|
|
Where string
|
|
Orderby string
|
|
Limit string
|
|
}
|
|
|
|
type DBJoin struct {
|
|
Table1 string
|
|
Table2 string
|
|
Columns string
|
|
Joiners string
|
|
Where string
|
|
Orderby string
|
|
Limit string
|
|
}
|
|
|
|
type DBInsert struct {
|
|
Table string
|
|
Columns string
|
|
Fields string
|
|
}
|
|
|
|
type DBColumn struct {
|
|
Table string
|
|
Left string // Could be a function or a column, so I'm naming this Left
|
|
Alias string // aka AS Blah, if it's present
|
|
Type string // function or column
|
|
}
|
|
|
|
type DBField struct {
|
|
Name string
|
|
Type string
|
|
}
|
|
|
|
type DBWhere struct {
|
|
Expr []DBToken // Simple expressions, the innards of functions are opaque for now.
|
|
}
|
|
|
|
type DBJoiner struct {
|
|
LeftTable string
|
|
LeftColumn string
|
|
RightTable string
|
|
RightColumn string
|
|
Operator string
|
|
}
|
|
|
|
type DBOrder struct {
|
|
Column string
|
|
Order string
|
|
}
|
|
|
|
type DBToken struct {
|
|
Contents string
|
|
Type string // function, operator, column, number, string, substitute
|
|
}
|
|
|
|
type DBSetter struct {
|
|
Column string
|
|
Expr []DBToken // Simple expressions, the innards of functions are opaque for now.
|
|
}
|
|
|
|
type DBLimit struct {
|
|
Offset string // ? or int
|
|
MaxCount string // ? or int
|
|
}
|
|
|
|
type DBStmt struct {
|
|
Contents string
|
|
Type string // create-table, insert, update, delete
|
|
}
|
|
|
|
// TODO: Add the DropTable, TableExists, AddColumn, ColumnExists, and RemoveColumn methods
|
|
type Adapter interface {
|
|
GetName() string
|
|
BuildConn(config map[string]string) (*sql.DB, error)
|
|
DbVersion() string
|
|
|
|
DropTable(name string, table string) (string, error)
|
|
CreateTable(name string, table string, charset string, collation string, columns []DBTableColumn, keys []DBTableKey) (string, error)
|
|
// TODO: Some way to add indices and keys
|
|
// TODO: Test this
|
|
AddColumn(name string, table string, column DBTableColumn) (string, error)
|
|
SimpleInsert(name string, table string, columns string, fields string) (string, error)
|
|
SimpleUpdate(up *updatePrebuilder) (string, error)
|
|
SimpleUpdateSelect(up *updatePrebuilder) (string, error) // ! Experimental
|
|
SimpleDelete(name string, table string, where string) (string, error)
|
|
Purge(name string, table string) (string, error)
|
|
SimpleSelect(name string, table string, columns string, where string, orderby string, limit string) (string, error)
|
|
SimpleLeftJoin(name string, table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (string, error)
|
|
SimpleInnerJoin(string, string, string, string, string, string, string, string) (string, error)
|
|
SimpleInsertSelect(string, DBInsert, DBSelect) (string, error)
|
|
SimpleInsertLeftJoin(string, DBInsert, DBJoin) (string, error)
|
|
SimpleInsertInnerJoin(string, DBInsert, DBJoin) (string, error)
|
|
SimpleCount(string, string, string, string) (string, error)
|
|
|
|
ComplexSelect(*selectPrebuilder) (string, error)
|
|
|
|
Builder() *prebuilder
|
|
Write() error
|
|
}
|
|
|
|
func GetAdapter(name string) (adap Adapter, err error) {
|
|
for _, adapter := range Registry {
|
|
if adapter.GetName() == name {
|
|
return adapter, nil
|
|
}
|
|
}
|
|
return adap, ErrNoAdapter
|
|
}
|
|
|
|
type QueryPlugin interface {
|
|
Hook(name string, args ...interface{}) error
|
|
Write() error
|
|
}
|
|
|
|
type MySQLUpsertCallback struct {
|
|
stmt *sql.Stmt
|
|
}
|
|
|
|
func (double *MySQLUpsertCallback) Exec(args ...interface{}) (res sql.Result, err error) {
|
|
if len(args) < 2 {
|
|
return res, errors.New("Need two or more arguments")
|
|
}
|
|
args = args[:len(args)-1]
|
|
return double.stmt.Exec(append(args, args...)...)
|
|
}
|
|
|
|
func PrepareMySQLUpsertCallback(db *sql.DB, query string) (*MySQLUpsertCallback, error) {
|
|
stmt, err := db.Prepare(query)
|
|
return &MySQLUpsertCallback{stmt}, err
|
|
}
|
|
|
|
type LitStr string
|
|
|
|
// TODO: Test this
|
|
func InterfaceMapToInsertStrings(data map[string]interface{}, order string) (cols string, values string) {
|
|
var done = make(map[string]bool)
|
|
var addValue = func(value interface{}) {
|
|
switch value := value.(type) {
|
|
case string:
|
|
values += "'" + strings.Replace(value, "'", "\\'", -1) + "',"
|
|
case int:
|
|
values += strconv.Itoa(value) + ","
|
|
case LitStr:
|
|
values += string(value) + ","
|
|
case bool:
|
|
if value {
|
|
values += "1,"
|
|
} else {
|
|
values += "0,"
|
|
}
|
|
}
|
|
}
|
|
|
|
// Add the ordered items
|
|
for _, col := range strings.Split(order, ",") {
|
|
col = strings.TrimSpace(col)
|
|
value, ok := data[col]
|
|
if ok {
|
|
cols += col + ","
|
|
addValue(value)
|
|
done[col] = true
|
|
}
|
|
}
|
|
|
|
// Go over any unordered items and add them at the end
|
|
if len(data) > len(done) {
|
|
for col, value := range data {
|
|
_, ok := done[col]
|
|
if ok {
|
|
continue
|
|
}
|
|
cols += col + ","
|
|
addValue(value)
|
|
}
|
|
}
|
|
|
|
if cols != "" {
|
|
cols = cols[:len(cols)-1]
|
|
values = values[:len(values)-1]
|
|
}
|
|
return cols, values
|
|
}
|