3465e4c08f
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.
212 lines
7.5 KiB
Go
212 lines
7.5 KiB
Go
/* WIP Under Construction */
|
|
package qgen
|
|
|
|
import (
|
|
"database/sql"
|
|
"log"
|
|
)
|
|
|
|
var Builder *builder
|
|
|
|
func init() {
|
|
Builder = &builder{conn: nil}
|
|
}
|
|
|
|
// A set of wrappers around the generator methods, so that we can use this inline in Gosora
|
|
type builder struct {
|
|
conn *sql.DB
|
|
adapter Adapter
|
|
}
|
|
|
|
func (build *builder) Accumulator() *Accumulator {
|
|
return &Accumulator{build.conn, build.adapter, nil}
|
|
}
|
|
|
|
// TODO: Move this method out of builder?
|
|
func (build *builder) Init(adapter string, config map[string]string) error {
|
|
err := build.SetAdapter(adapter)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
conn, err := build.adapter.BuildConn(config)
|
|
build.conn = conn
|
|
log.Print("err: ", err) // Is the problem here somehow?
|
|
return err
|
|
}
|
|
|
|
func (build *builder) SetConn(conn *sql.DB) {
|
|
build.conn = conn
|
|
}
|
|
|
|
func (build *builder) GetConn() *sql.DB {
|
|
return build.conn
|
|
}
|
|
|
|
func (build *builder) SetAdapter(name string) error {
|
|
adap, err := GetAdapter(name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
build.adapter = adap
|
|
return nil
|
|
}
|
|
|
|
func (build *builder) GetAdapter() Adapter {
|
|
return build.adapter
|
|
}
|
|
|
|
func (build *builder) DbVersion() (dbVersion string) {
|
|
build.conn.QueryRow(build.adapter.DbVersion()).Scan(&dbVersion)
|
|
return dbVersion
|
|
}
|
|
|
|
func (build *builder) Begin() (*sql.Tx, error) {
|
|
return build.conn.Begin()
|
|
}
|
|
|
|
func (build *builder) Tx(handler func(*TransactionBuilder) error) error {
|
|
tx, err := build.conn.Begin()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = handler(&TransactionBuilder{tx, build.adapter, nil})
|
|
if err != nil {
|
|
tx.Rollback()
|
|
return err
|
|
}
|
|
return tx.Commit()
|
|
}
|
|
|
|
func (build *builder) prepare(res string, err error) (*sql.Stmt, error) {
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return build.conn.Prepare(res)
|
|
}
|
|
|
|
func (build *builder) SimpleSelect(table string, columns string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleSelect("", table, columns, where, orderby, limit))
|
|
}
|
|
|
|
func (build *builder) SimpleCount(table string, where string, limit string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleCount("", table, where, limit))
|
|
}
|
|
|
|
func (build *builder) SimpleLeftJoin(table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleLeftJoin("", table1, table2, columns, joiners, where, orderby, limit))
|
|
}
|
|
|
|
func (build *builder) SimpleInnerJoin(table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleInnerJoin("", table1, table2, columns, joiners, where, orderby, limit))
|
|
}
|
|
|
|
func (build *builder) DropTable(table string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.DropTable("", table))
|
|
}
|
|
|
|
func (build *builder) CreateTable(table string, charset string, collation string, columns []DBTableColumn, keys []DBTableKey) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.CreateTable("", table, charset, collation, columns, keys))
|
|
}
|
|
|
|
func (build *builder) AddColumn(table string, column DBTableColumn) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.AddColumn("", table, column))
|
|
}
|
|
|
|
func (build *builder) SimpleInsert(table string, columns string, fields string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleInsert("", table, columns, fields))
|
|
}
|
|
|
|
func (build *builder) SimpleInsertSelect(ins DBInsert, sel DBSelect) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleInsertSelect("", ins, sel))
|
|
}
|
|
|
|
func (build *builder) SimpleInsertLeftJoin(ins DBInsert, sel DBJoin) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleInsertLeftJoin("", ins, sel))
|
|
}
|
|
|
|
func (build *builder) SimpleInsertInnerJoin(ins DBInsert, sel DBJoin) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleInsertInnerJoin("", ins, sel))
|
|
}
|
|
|
|
func (build *builder) SimpleUpdate(table string, set string, where string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleUpdate(qUpdate(table, set, where)))
|
|
}
|
|
|
|
func (build *builder) SimpleDelete(table string, where string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.SimpleDelete("", table, where))
|
|
}
|
|
|
|
// I don't know why you need this, but here it is x.x
|
|
func (build *builder) Purge(table string) (stmt *sql.Stmt, err error) {
|
|
return build.prepare(build.adapter.Purge("", table))
|
|
}
|
|
|
|
func (build *builder) prepareTx(tx *sql.Tx, res string, err error) (*sql.Stmt, error) {
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return tx.Prepare(res)
|
|
}
|
|
|
|
// These ones support transactions
|
|
func (build *builder) SimpleSelectTx(tx *sql.Tx, table string, columns string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleSelect("", table, columns, where, orderby, limit)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleCountTx(tx *sql.Tx, table string, where string, limit string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleCount("", table, where, limit)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleLeftJoinTx(tx *sql.Tx, table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleLeftJoin("", table1, table2, columns, joiners, where, orderby, limit)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleInnerJoinTx(tx *sql.Tx, table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleInnerJoin("", table1, table2, columns, joiners, where, orderby, limit)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) CreateTableTx(tx *sql.Tx, table string, charset string, collation string, columns []DBTableColumn, keys []DBTableKey) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.CreateTable("", table, charset, collation, columns, keys)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleInsertTx(tx *sql.Tx, table string, columns string, fields string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleInsert("", table, columns, fields)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleInsertSelectTx(tx *sql.Tx, ins DBInsert, sel DBSelect) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleInsertSelect("", ins, sel)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleInsertLeftJoinTx(tx *sql.Tx, ins DBInsert, sel DBJoin) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleInsertLeftJoin("", ins, sel)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleInsertInnerJoinTx(tx *sql.Tx, ins DBInsert, sel DBJoin) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleInsertInnerJoin("", ins, sel)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleUpdateTx(tx *sql.Tx, table string, set string, where string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleUpdate(qUpdate(table, set, where))
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
func (build *builder) SimpleDeleteTx(tx *sql.Tx, table string, where string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.SimpleDelete("", table, where)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|
|
|
|
// I don't know why you need this, but here it is x.x
|
|
func (build *builder) PurgeTx(tx *sql.Tx, table string) (stmt *sql.Stmt, err error) {
|
|
res, err := build.adapter.Purge("", table)
|
|
return build.prepareTx(tx, res, err)
|
|
}
|