2017-06-13 07:12:58 +00:00
|
|
|
/* WIP Under Construction */
|
|
|
|
package qgen
|
2017-06-19 08:06:54 +00:00
|
|
|
|
2017-08-15 13:47:56 +00:00
|
|
|
//import "log"
|
2017-06-13 08:56:48 +00:00
|
|
|
import "database/sql"
|
2017-06-13 07:12:58 +00:00
|
|
|
|
2017-06-13 08:56:48 +00:00
|
|
|
var Builder *builder
|
|
|
|
|
|
|
|
func init() {
|
2017-10-16 07:32:58 +00:00
|
|
|
Builder = &builder{conn: nil}
|
2017-06-13 08:56:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// A set of wrappers around the generator methods, so that we can use this inline in Gosora
|
2017-10-16 07:32:58 +00:00
|
|
|
type builder struct {
|
|
|
|
conn *sql.DB
|
2017-06-13 08:56:48 +00:00
|
|
|
adapter DB_Adapter
|
|
|
|
}
|
|
|
|
|
2017-11-06 04:02:35 +00:00
|
|
|
func (build *builder) Accumulator() *accBuilder {
|
|
|
|
return &accBuilder{build.conn, build.adapter, nil}
|
|
|
|
}
|
|
|
|
|
2017-06-13 08:56:48 +00:00
|
|
|
func (build *builder) SetConn(conn *sql.DB) {
|
|
|
|
build.conn = conn
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SetAdapter(name string) error {
|
|
|
|
adap, err := GetAdapter(name)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
build.adapter = adap
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-10-16 07:32:58 +00:00
|
|
|
func (build *builder) GetAdapter() DB_Adapter {
|
|
|
|
return build.adapter
|
|
|
|
}
|
|
|
|
|
2017-10-30 09:57:08 +00:00
|
|
|
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()
|
|
|
|
}
|
|
|
|
|
2017-06-15 11:40:35 +00:00
|
|
|
func (build *builder) SimpleSelect(table string, columns string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleSelect("_builder", table, columns, where, orderby, limit)
|
2017-06-13 08:56:48 +00:00
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
2017-06-19 08:06:54 +00:00
|
|
|
}
|
|
|
|
|
2017-08-15 13:47:56 +00:00
|
|
|
func (build *builder) SimpleCount(table string, where string, limit string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleCount("_builder", table, where, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
//log.Print("res",res)
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
2017-06-19 08:06:54 +00:00
|
|
|
func (build *builder) SimpleLeftJoin(table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleLeftJoin("_builder", table1, table2, columns, joiners, where, orderby, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
2017-08-15 13:47:56 +00:00
|
|
|
//log.Print("res",res)
|
2017-06-19 08:06:54 +00:00
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInnerJoin(table1 string, table2 string, columns string, joiners string, where string, orderby string, limit string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInnerJoin("_builder", table1, table2, columns, joiners, where, orderby, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
2017-08-15 13:47:56 +00:00
|
|
|
//log.Print("res",res)
|
2017-06-19 08:06:54 +00:00
|
|
|
return build.conn.Prepare(res)
|
2017-06-13 07:12:58 +00:00
|
|
|
}
|
2017-06-14 07:09:44 +00:00
|
|
|
|
Added the Social Groups plugin. This is still under construction.
Made a few improvements to the ForumStore, including bringing it's API closer in line with the other datastores, adding stubs for future subforum functionality, and improving efficiency in a few places.
The auth interface now handles all the authentication stuff.
Renamed the debug config variable to debug_mode.
Added the PluginPerms API.
Internal Errors will now dump the stack trace in the console.
Added support for installable plugins.
Refactored the routing logic so that the router now handles the common PreRoute logic(exc. /static/)
Added the CreateTable method to the query generator. It might need some tweaking to better support other database systems.
Added the same CreateTable method to the query builder.
Began work on PostgreSQL support.
Added the string-string hook type
Added the pre_render hook type.
Added the ParentID and ParentType fields to forums.
Added the get_forum_url_prefix function.
Added a more generic build_slug function.
Added the get_topic_url_prefix function.
Added the override_perms and override_forum_perms functions for bulk setting and unsetting permissions.
Added more ExtData fields in a few structs and removed them on the Perms struct as the PluginPerms API supersedes them there.
Plugins can now see the router instance.
The plugin initialisation handlers can now throw errors.
Plugins are now initialised after all the forum's subsystems are.
Refactored the unit test logic. For instance, we now use the proper .Log method rather than fmt.Println in many cases.
Sorry, we'll have to break Github's generated file detection, as the build instructions aren't working, unless I put them at the top, and they're far, far more important than getting Github to recognise the generated code as generated code.
Fixed an issue with mysql.go's _init_database() overwriting the dbpassword variable. Not a huge issue, but it is a "gotcha" for those not expecting a ':' at the start.
Fixed an issue with forum creation where the forum permissions didn't get cached.
Fixed a bug in plugin_bbcode where negative numbers in rand would crash Gosora.
Made the outputs of plugin_markdown and plugin_bbcode more compliant with the tests.
Revamped the phrase system to make it easier for us to add language pack related features in the future.
Added the WidgetMenu widget type.
Revamped the theme again. I'm experimenting to see which approach I like most.
- Excuse the little W3C rage. Some things about CSS drive me crazy :p
Tests:
Added 22 bbcode_full_parse tests.
Added 19 bbcode_regex_parse tests.
Added 27 markdown_parse tests.
Added four UserStore tests. More to come when the test database functionality is added.
Added 18 name_to_slug tests.
Hooks:
Added the pre_render hook.
Added the pre_render_forum_list hook.
Added the pre_render_view_forum hook.
Added the pre_render_topic_list hook.
Added the pre_render_view_topic hook.
Added the pre_render_profile hook.
Added the pre_render_custom_page hook.
Added the pre_render_overview hook.
Added the pre_render_create_topic hook.
Added the pre_render_account_own_edit_critical hook.
Added the pre_render_account_own_edit_avatar hook.
Added the pre_render_account_own_edit_username hook.
Added the pre_render_account_own_edit_email hook.
Added the pre_render_login hook.
Added the pre_render_register hook.
Added the pre_render_ban hook.
Added the pre_render_panel_dashboard hook.
Added the pre_render_panel_forums hook.
Added the pre_render_panel_delete_forum hook.
Added the pre_render_panel_edit_forum hook.
Added the pre_render_panel_settings hook.
Added the pre_render_panel_setting hook.
Added the pre_render_panel_plugins hook.
Added the pre_render_panel_users hook.
Added the pre_render_panel_edit_user hook.
Added the pre_render_panel_groups hook.
Added the pre_render_panel_edit_group hook.
Added the pre_render_panel_edit_group_perms hook.
Added the pre_render_panel_themes hook.
Added the pre_render_panel_mod_log hook.
Added the pre_render_error hook.
Added the pre_render_security_error hook.
Added the create_group_preappend hook.
Added the intercept_build_widgets hook.
Added the simple_forum_check_pre_perms hook.
Added the forum_check_pre_perms hook.
2017-07-09 12:06:04 +00:00
|
|
|
func (build *builder) CreateTable(table string, charset string, collation string, columns []DB_Table_Column, keys []DB_Table_Key) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.CreateTable("_builder", table, charset, collation, columns, keys)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
2017-06-14 07:09:44 +00:00
|
|
|
func (build *builder) SimpleInsert(table string, columns string, fields string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsert("_builder", table, columns, fields)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
2017-06-25 09:56:39 +00:00
|
|
|
func (build *builder) SimpleInsertSelect(ins DB_Insert, sel DB_Select) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsertSelect("_builder", ins, sel)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInsertLeftJoin(ins DB_Insert, sel DB_Join) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsertLeftJoin("_builder", ins, sel)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInsertInnerJoin(ins DB_Insert, sel DB_Join) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsertInnerJoin("_builder", ins, sel)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
2017-06-14 07:09:44 +00:00
|
|
|
func (build *builder) SimpleUpdate(table string, set string, where string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleUpdate("_builder", table, set, where)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleDelete(table string, where string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleDelete("_builder", table, where)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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) {
|
|
|
|
res, err := build.adapter.Purge("_builder", table)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return build.conn.Prepare(res)
|
|
|
|
}
|
2017-10-21 00:27:47 +00:00
|
|
|
|
|
|
|
// 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("_builder", table, columns, where, orderby, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleCountTx(tx *sql.Tx, table string, where string, limit string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleCount("_builder", table, where, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
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("_builder", table1, table2, columns, joiners, where, orderby, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
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("_builder", table1, table2, columns, joiners, where, orderby, limit)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) CreateTableTx(tx *sql.Tx, table string, charset string, collation string, columns []DB_Table_Column, keys []DB_Table_Key) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.CreateTable("_builder", table, charset, collation, columns, keys)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInsertTx(tx *sql.Tx, table string, columns string, fields string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsert("_builder", table, columns, fields)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInsertSelectTx(tx *sql.Tx, ins DB_Insert, sel DB_Select) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsertSelect("_builder", ins, sel)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInsertLeftJoinTx(tx *sql.Tx, ins DB_Insert, sel DB_Join) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsertLeftJoin("_builder", ins, sel)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleInsertInnerJoinTx(tx *sql.Tx, ins DB_Insert, sel DB_Join) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleInsertInnerJoin("_builder", ins, sel)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleUpdateTx(tx *sql.Tx, table string, set string, where string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleUpdate("_builder", table, set, where)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (build *builder) SimpleDeleteTx(tx *sql.Tx, table string, where string) (stmt *sql.Stmt, err error) {
|
|
|
|
res, err := build.adapter.SimpleDelete("_builder", table, where)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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("_builder", table)
|
|
|
|
if err != nil {
|
|
|
|
return stmt, err
|
|
|
|
}
|
|
|
|
return tx.Prepare(res)
|
|
|
|
}
|