6935637867
Cascade delete replied to topic events for replies properly. Cascade delete likes on topic posts properly. Cascade delete replies and their children properly. Recalculate user stats properly when items are deleted. Users can now unlike topic opening posts. Add a recalculator to fix abnormalities across upgrades. Try fixing a last_ip daily update bug. Add Existable interface. Add Delete method to LikeStore. Add Each, Exists, Create, CountUser, CountMegaUser and CountBigUser methods to ReplyStore. Add CountUser, CountMegaUser, CountBigUser methods to TopicStore. Add Each method to UserStore. Add Add, Delete and DeleteResource methods to SubscriptionStore. Add Delete, DeleteByParams, DeleteByParamsExtra and AidsByParamsExtra methods to ActivityStream. Add Exists method to ProfileReplyStore. Add DropColumn, RenameColumn and ChangeColumn to the database adapters. Shorten ipaddress column names to ip. - topics table. - replies table - users_replies table. - polls_votes table. Add extra column to activity_stream table. Fix an issue upgrading sites to MariaDB 10.3 from older versions of Gosora. Please report any other issues you find. You need to run the updater / patcher for this commit.
247 lines
5.7 KiB
Go
247 lines
5.7 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
|
|
|
|
// Foreign keys only
|
|
FTable string
|
|
Cascade bool
|
|
}
|
|
|
|
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 int
|
|
}
|
|
|
|
const (
|
|
IdenFunc = iota
|
|
IdenColumn
|
|
IdenString
|
|
IdenLiteral
|
|
)
|
|
|
|
type DBField struct {
|
|
Name string
|
|
//Type string
|
|
Type int
|
|
}
|
|
|
|
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
|
|
}
|
|
|
|
const (
|
|
TokenFunc = iota
|
|
TokenOp
|
|
TokenColumn
|
|
TokenNumber
|
|
TokenString
|
|
TokenSub
|
|
TokenOr
|
|
TokenNot
|
|
TokenLike
|
|
)
|
|
|
|
type DBToken struct {
|
|
Contents string
|
|
//Type string // function, op, column, number, string, sub, not, like
|
|
Type int
|
|
}
|
|
|
|
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, table string) (string, error)
|
|
CreateTable(name, table, charset, collation string, columns []DBTableColumn, keys []DBTableKey) (string, error)
|
|
// TODO: Some way to add indices and keys
|
|
// TODO: Test this
|
|
AddColumn(name, table string, column DBTableColumn, key *DBTableKey) (string, error)
|
|
DropColumn(name, table, colname string) (string, error)
|
|
RenameColumn(name, table, oldName, newName string) (string, error)
|
|
ChangeColumn(name, table, colName string, col DBTableColumn) (string, error)
|
|
SetDefaultColumn(name, table, colName, colType, defaultStr string) (string, error)
|
|
AddIndex(name, table, iname, colname string) (string, error)
|
|
AddKey(name, table, column string, key DBTableKey) (string, error)
|
|
AddForeignKey(name, table, column, ftable, fcolumn string, cascade bool) (out string, e error)
|
|
SimpleInsert(name, table, columns, fields string) (string, error)
|
|
SimpleUpdate(b *updatePrebuilder) (string, error)
|
|
SimpleUpdateSelect(b *updatePrebuilder) (string, error) // ! Experimental
|
|
SimpleDelete(name, table, where string) (string, error)
|
|
Purge(name, table string) (string, error)
|
|
SimpleSelect(name, table, columns, where, orderby, limit string) (string, error)
|
|
ComplexDelete(b *deletePrebuilder) (string, error)
|
|
SimpleLeftJoin(name, table1, table2, columns, joiners, where, orderby, 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, values string) {
|
|
done := make(map[string]bool)
|
|
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
|
|
}
|