From 2deee69e2f9ecd239e59bf651e73c6780227c824 Mon Sep 17 00:00:00 2001 From: David M Date: Wed, 2 Apr 2008 08:28:21 +0000 Subject: [PATCH] Some neat stuff, the new DBAL function has the potential of removing somewhere in the ballpark of 40% of all the DBAL code. It combines a few very common idioms into one statement, allowing us to implicitly use prepared statements. Short term advantages are the ability to remove the gross code that attempts to work around DB2, Oracle and Firebird. Long term advantages include removing the burden of sanitizing data (at least on input) from our end and placing it on shoulders of the backend PHP driver. Also included is a new posting API I am working on. It is not a real API in so much as it is a backend that a "nice" API could use. User submitted functions are welcome :) It represents a massive simplification in post and topic accounting and a generalization of concepts like "soft deletion" as it works across both topics and posts (yes, this has preliminary support for soft deletions). The only "interesting" problem left is global topics, this has yet to be solved. Enough talk, time for sleep. P.S. Sorry if I broke stuff, was not done on purpose :) git-svn-id: file:///svn/phpbb/trunk@8485 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/posting-api.php | 455 +++++++++++++++++++++++++ phpBB/includes/acp/acp_attachments.php | 1 + phpBB/includes/db/db2.php | 31 ++ phpBB/includes/db/firebird.php | 31 ++ phpBB/includes/db/mssql.php | 15 + phpBB/includes/db/mssql_odbc.php | 31 ++ phpBB/includes/db/mysql.php | 15 + phpBB/includes/db/mysqli.php | 35 ++ phpBB/includes/db/oracle.php | 33 ++ phpBB/includes/db/postgres.php | 35 ++ phpBB/includes/db/sqlite.php | 15 + phpBB/style.php | 1 + 12 files changed, 698 insertions(+) create mode 100644 phpBB/develop/posting-api.php diff --git a/phpBB/develop/posting-api.php b/phpBB/develop/posting-api.php new file mode 100644 index 0000000000..2029ffc3d3 --- /dev/null +++ b/phpBB/develop/posting-api.php @@ -0,0 +1,455 @@ +transaction('BEGIN'); + + $user_id = (int) $data['user_id']; + $forum_id = (int) $data['forum_id']; + $topic_title = $data['title']; + $post_contents = $data['post_contents']; + $approved = $data['approved']; + $time = ($data['time']) ? (int) $data['time'] : time(); + + if (isset($data['username'])) + { + $username = $data['username']; + } + else + { + $sql = 'SELECT username + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . $user_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $username = $row['username']; + $db->sql_freeresult($result); + } + + $sql = 'SELECT forum_topics, forum_unapproved_topics, forum_posts, forum_unapproved_posts + FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . (int) $forum_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($query); + $db->sql_freeresult($result); + + // everything starts out normal, one way or another + $topic_status = self::NORMAL; + + // are we approved? + if (!$approved) + { + // this topic is going to be unapproved + $topic_status |= self::UNAPPROVED; + } + + // throw our topic to the dogs + $topic_data = array( + 'topic_title' => $topic_title, + 'topic_status' => $topic_status, + 'topic_posts' => 1, + 'topic_moved_posts' => 0, + 'topic_deleted_posts' => 0, + 'topic_unapproved_posts' => ($approved ? 0 : 1), + 'topic_first_poster_name' => $username, + 'topic_poster' => $user_id, + 'topic_last_username' => $username, + 'topic_last_post_title' => $topic_title, + 'topic_last_post_time' => $time, + 'topic_last_poster_id' => $user_id, + 'forum_id' => $forum_id + ); + + $db->sql_handle_data('INSERT', TOPICS_TABLE, $topic_data); + $topic_id = $db->sql_nextid(); + + // I suppose it is time to make us a post, no? + $post_data = array( + 'topic_id' => $topic_id, + 'post_subject' => $topic_title, + 'post_body' => $post_contents, + 'post_username' => $username, + 'poster_id' => $user_id, + 'post_status' => $topic_status, + 'forum_id' => $forum_id + ); + + $db->sql_handle_data('INSERT', POSTS_TABLE, $post_data); + $post_id = $db->sql_nextid(); + + // time to fill in the blanks + $db->sql_handle_data('UPDATE', TOPICS_TABLE, array('topic_first_post_id' => $post_id, 'topic_last_post_id' => $post_id), "topic_id = $topic_id"); + + // let's go update the forum table + $forum_data = array( + 'forum_posts' => ++$row['forum_posts'], + 'forum_topics' => ++$row['forum_topics'], + ); + + // the last post inserted is always the latest, + // we must update the forum records to make sure everybody knows the good news + if ($approved) + { + $forum_data['forum_last_poster_name'] = $username; + $forum_data['forum_last_user_id'] = $user_id; + $forum_data['forum_last_post_title'] = $topic_title; + $forum_data['forum_last_post_time'] = $time; + } + else + { + $forum_data['forum_unapproved_posts'] = ++$row['forum_unapproved_posts']; + $forum_data['forum_unapproved_topics'] = ++$row['forum_unapproved_topics']; + } + + $db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_data, "forum_id = $forum_id"); + + // we are consistant, victory is ours + $db->transaction('END'); + } + + public function insert_post($data) + { + global $db; + // one transaction, we can now garuntee that atomicity of insertions + $db->transaction('BEGIN'); + + $user_id = (int) $data['user_id']; + $topic_id = (int) $data['topic_id']; + + // begin massive amounts of hand holding + + if (isset($data['forum_id'])) + { + $forum_id = (int) $data['forum_id']; + } + else + { + $sql = 'SELECT forum_id + FROM ' . TOPICS_TABLE . ' + WHERE topic_id = ' . $topic_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $forum_id = (int) $row['forum_id']; + $db->sql_freeresult($result); + } + + $post_title = $data['title']; + $post_contents = $data['post_contents']; + $approved = $data['approved']; + $time = ($data['time']) ? (int) $data['time'] : time(); + + if (isset($data['username'])) + { + $username = $data['username']; + } + else + { + $sql = 'SELECT username + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . $user_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $username = $row['username']; + $db->sql_freeresult($result); + } + + // hand holding complete, lets write some posts + + $sql = 'SELECT forum_topics, forum_unapproved_topics, forum_posts, forum_unapproved_posts + FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . (int) $forum_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($query); + $db->sql_freeresult($result); + + // everything starts out normal, one way or another + $post_status = self::NORMAL; + + // are we approved? + if (!$approved) + { + // this topic is going to be unapproved + $post_status |= self::UNAPPROVED; + } + + // I suppose it is time to make us a post, no? + $post_data = array( + 'topic_id' => $topic_id, + 'post_subject' => $post_title, + 'post_body' => $post_contents, + 'post_username' => $username, + 'poster_id' => $user_id, + 'post_status' => $post_status, + 'forum_id' => $forum_id, + ); + $db->sql_handle_data('INSERT', POSTS_TABLE, $post_data); + + // what is the new post_id? + $post_id = $db->sql_nextid(); + + // iceberg ahead! we must only update the topic information if the post is approved ;) + if ($approved) + { + // time to fill in the blanks + $topics_data = array( + 'topic_last_poster_id' => $user_id, + 'topic_last_post_id' => $post_id, + 'topic_last_poster_name'=> $username, + 'topic_last_post_title' => $post_title, + 'topic_last_post_time' => $time, + ); + $db->sql_handle_data('UPDATE', TOPICS_TABLE, $topics_data, "topic_id = $topic_id"); + } + + // let's go update the forum table + $forum_data = array( + 'forum_posts' => ++$row['forum_posts'], + ); + + // the last post inserted is always the latest, + // we must update the forum records to make sure everybody knows the good news + if ($approved) + { + $forum_data['forum_last_poster_name'] = $username; + $forum_data['forum_last_user_id'] = $user_id; + $forum_data['forum_last_post_title'] = $topic_title; + $forum_data['forum_last_post_time'] = $time; + } + else + { + $forum_data['forum_unapproved_posts'] = ++$row['forum_unapproved_posts']; + } + + $db->sql_handle_data('UPDATE', FORUMS_TABLE, $forum_data, "forum_id = $forum_id"); + + // we are consistant, victory is ours + $db->transaction('END'); + } + + function move_topic($data) + { + global $db; + + // lets get this party started + $db->transaction('BEGIN'); + + $topic_id = (int) $data['topic_id']; + $to_forum_id = (int) $data['forum_id']; + + // let us first determine how many items we are removing from the pool + $sql = 'SELECT topic_posts, topic_moved_posts, topic_deleted_posts, topic_unapproved_posts, forum_id as from_forum_id, topic_status + FROM ' . TOPICS_TABLE. ' + WHERE topic_id = ' . $topic_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + + $topic_status = (int) $row['topic_status']; + $from_forum_id = (int) $row['from_forum_id']; + + $topic_row['topic_posts'] = (int) $row['topic_posts']; + $topic_row['topic_moved_posts'] = (int) $row['topic_moved_posts']; + $topic_row['topic_deleted_posts'] = (int) $row['topic_deleted_posts']; + $topic_row['topic_unapproved_posts'] = (int) $row['topic_unapproved_posts']; + + $db->sql_freeresult($result); + + // let us first determine how many items we are removing from the pool + $sql = 'SELECT forum_posts, forum_moved_posts, forum_deleted_posts, forum_unapproved_posts, forum_id, forum_topics, forum_deleted_topics, forum_unapproved_topics + FROM ' . FORUMS_TABLE. ' + WHERE ' . $db->sql_in_set('forum_id', array($to_forum_id, $from_forum_id)); + $result = $db->sql_query($sql); + + $forum_row = array(); + while ($row = $db->sql_fetchrow($result)) + { + $forum_id = (int) $row['forum_id']; + + $forum_row[$forum_id]['forum_posts'] = (int) $row['forum_posts']; + $forum_row[$forum_id]['forum_moved_posts'] = (int) $row['forum_moved_posts']; + $forum_row[$forum_id]['forum_deleted_posts'] = (int) $row['forum_deleted_posts']; + $forum_row[$forum_id]['forum_unapproved_posts'] = (int) $row['forum_unapproved_posts']; + + $forum_row[$forum_id]['forum_topics'] = (int) $row['forum_topics']; + $forum_row[$forum_id]['forum_moved_topics'] = (int) $row['forum_moved_topics']; + $forum_row[$forum_id]['forum_deleted_topics'] = (int) $row['forum_deleted_topics']; + $forum_row[$forum_id]['forum_unapproved_topics'] = (int) $row['forum_unapproved_topics']; + } + + $db->sql_freeresult($result); + + // update the topic itself + $db->sql_handle_data('UPDATE', TOPICS_TABLE, array('forum_id' => $to_forum_id), "topic_id = $topic_id"); + + // update the posts now + $db->sql_handle_data('UPDATE', POSTS_TABLE, array('forum_id' => $to_forum_id), "forum_id = $topic_id"); + + // remove the numbers from the old forum row + $from_forum_array = array( + 'forum_posts' => $forum_row[$from_forum_id]['forum_posts'] - $topic_id['forum_posts'], + 'forum_moved_posts' => $forum_row[$from_forum_id]['forum_moved_posts'] - $topic_id['forum_moved_posts'], + 'forum_deleted_posts' => $forum_row[$from_forum_id]['forum_deleted_posts'] - $topic_id['forum_deleted_posts'], + 'forum_unapproved_posts' => $forum_row[$from_forum_id]['forum_unapproved_posts'] - $topic_id['forum_unapproved_posts'], + + 'forum_topics' => $forum_row[$from_forum_id]['forum_topics'] - 1, + 'forum_moved_topics' => $forum_row[$from_forum_id]['forum_moved_topics'] - (($topic_status & self::MOVED) ? 1 : 0), + 'forum_deleted_topics' => $forum_row[$from_forum_id]['forum_deleted_topics'] - (($topic_status & self::DELETED) ? 1 : 0), + 'forum_unapproved_topics' => $forum_row[$from_forum_id]['forum_unapproved_topics'] - (($topic_status & self::UNAPPROVED) ? 1 : 0), + ); + + // get the last "normal" post in the old forum, we _must_ update it + $sql = 'SELECT MAX(post_id) as max_post_id + FROM ' . POSTS_TABLE . ' + WHERE post_status = ' . self::NORMAL . ' + AND forum_id = ' . $from_forum_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + // anything left? + if ($row) + { + // OK, lets go do some magick + $sql = 'SELECT post_username, poster_id, post_subject, post_time + FROM '. POSTS_TABLE . ' + WHERE post_id = ' . (int) $row['max_post_id']; + $result = $db->sql_query($sql); + $last_post = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $from_forum_array['forum_last_user_id'] = (int) $last_post['poster_id']; + $from_forum_array['forum_last_poster_name'] = (int) $last_post['post_username']; + $from_forum_array['forum_last_post_title'] = (int) $last_post['post_subject']; + $from_forum_array['forum_last_post_time'] = (int) $last_post['post_time']; + } + + // update the old forum + $db->sql_handle_data('UPDATE', FORUMS_TABLE, $from_forum_array, "forum_id = $from_forum_id"); + + // add the numbers to the new forum row + $to_forum_array = array( + 'forum_posts' => $forum_row[$to_forum_id]['forum_posts'] - $topic_id['forum_posts'], + 'forum_moved_posts' => $forum_row[$to_forum_id]['forum_moved_posts'] - $topic_id['forum_moved_posts'], + 'forum_deleted_posts' => $forum_row[$to_forum_id]['forum_deleted_posts'] - $topic_id['forum_deleted_posts'], + 'forum_unapproved_posts'=> $forum_row[$to_forum_id]['forum_unapproved_posts'] - $topic_id['forum_unapproved_posts'], + + 'forum_topics' => $forum_row[$from_forum_id]['forum_topics'] + 1, + 'forum_moved_topics' => $forum_row[$from_forum_id]['forum_moved_topics'] + (($topic_status & self::MOVED) ? 1 : 0), + 'forum_deleted_topics' => $forum_row[$from_forum_id]['forum_deleted_topics'] + (($topic_status & self::DELETED) ? 1 : 0), + 'forum_unapproved_topics' => $forum_row[$from_forum_id]['forum_unapproved_topics'] + (($topic_status & self::UNAPPROVED) ? 1 : 0), + ); + + // the new topic is approved and is not soft deleted and is not moved, go and sync some status + if ($topic_status === self::NORMAL) + { + // get the lastest "normal" post in the new forum, we _must_ update it + $sql = 'SELECT MAX(post_id) as max_post_id + FROM ' . POSTS_TABLE . ' + WHERE post_status = ' . self::NORMAL . ' + AND forum_id = ' . $to_forum_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + // anything left? + if ($row) + { + // OK, lets go do some magick + $sql = 'SELECT post_username, poster_id, post_subject, post_time + FROM '. POSTS_TABLE . ' + WHERE post_id = ' . (int) $row['max_post_id']; + $result = $db->sql_query($sql); + $last_post = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $from_forum_array['forum_last_user_id'] = (int) $last_post['poster_id']; + $from_forum_array['forum_last_poster_name'] = (int) $last_post['post_username']; + $from_forum_array['forum_last_post_title'] = (int) $last_post['post_subject']; + $from_forum_array['forum_last_post_time'] = (int) $last_post['post_time']; + } + } + + // update the new forum + $db->sql_handle_data('UPDATE', FORUMS_TABLE, $to_forum_array, "forum_id = $to_forum_id"); + + // in hundreds of fewer lines of code, we have now moved a topic + // (this totally ignores the shadow topic thingy, I do not care for now) + $db->transaction('COMMIT'); + } +} + +?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index d2beba55c5..0d0f058392 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -535,6 +535,7 @@ class acp_attachments $group_ary['download_mode'] = INLINE_LINK; } + // @TODO: rewrite with the new param db functions $sql = ($action == 'add') ? 'INSERT INTO ' . EXTENSION_GROUPS_TABLE . ' ' : 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET '; $sql .= $db->sql_build_array((($action == 'add') ? 'INSERT' : 'UPDATE'), $group_ary); $sql .= ($action == 'edit') ? " WHERE group_id = $group_id" : ''; diff --git a/phpBB/includes/db/db2.php b/phpBB/includes/db/db2.php index 40909050c9..ecabc1c2e1 100644 --- a/phpBB/includes/db/db2.php +++ b/phpBB/includes/db/db2.php @@ -351,6 +351,37 @@ class dbal_db2 extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type == 'INSERT') + { + $stmt = db2_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')'); + } + else + { + $query = "UPDATE $table SET "; + + $set = array(); + foreach (array_keys($data) as $key) + { + $set[] = "$key = ?"; + } + $query .= implode(', ', $set); + + if ($where !== '') + { + $query .= $where; + } + + $stmt = db2_prepare($this->db_connect_id, $query); + } + + // get the stmt onto the top of the function arguments + array_unshift($data, $stmt); + + call_user_func_array('db2_execute', $data); + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index afb649a4f4..48eb22046e 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -352,6 +352,37 @@ class dbal_firebird extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type == 'INSERT') + { + $stmt = ibase_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')'); + } + else + { + $query = "UPDATE $table SET "; + + $set = array(); + foreach (array_keys($data) as $key) + { + $set[] = "$key = ?"; + } + $query .= implode(', ', $set); + + if ($where !== '') + { + $query .= $where; + } + + $stmt = ibase_prepare($this->db_connect_id, $query); + } + + // get the stmt onto the top of the function arguments + array_unshift($data, $stmt); + + call_user_func_array('ibase_execute', $data); + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index bf6190c79c..a6c8d26a4d 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -303,6 +303,21 @@ class dbal_mssql extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type === 'UPDATE') + { + $this->sql_query('INSERT INTO ' . $table . ' ' . + $this->sql_build_array('INSERT', $data)); + } + else + { + $this->sql_query('UPDATE ' . $table . ' + SET ' . $db->sql_build_array('UPDATE', $data) . + $where); + } + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php index de96939035..f79cd55af4 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/mssql_odbc.php @@ -313,6 +313,37 @@ class dbal_mssql_odbc extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type === 'INSERT') + { + $stmt = odbc_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')'); + } + else + { + $query = "UPDATE $table SET "; + + $set = array(); + foreach (array_keys($data) as $key) + { + $set[] = "$key = ?"; + } + $query .= implode(', ', $set); + + if ($where !== '') + { + $query .= $where; + } + + $stmt = odbc_prepare($this->db_connect_id, $query); + } + + // get the stmt onto the top of the function arguments + array_unshift($data, $stmt); + + call_user_func_array('odbc_execute', $data); + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index 1014fe6780..1e32b8178a 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -284,6 +284,21 @@ class dbal_mysql extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type === 'UPDATE') + { + $this->sql_query('INSERT INTO ' . $table . ' ' . + $this->sql_build_array('INSERT', $data)); + } + else + { + $this->sql_query('UPDATE ' . $table . ' + SET ' . $db->sql_build_array('UPDATE', $data) . + $where); + } + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index ffe39d63bf..48ea8d3c53 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -269,6 +269,41 @@ class dbal_mysqli extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type === 'INSERT') + { + $stmt = mysqli_prepare($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (" . substr(str_repeat('?, ', sizeof($data)) ,0, -1) . ')'); + } + else + { + $query = "UPDATE $table SET "; + + $set = array(); + foreach (array_keys($data) as $key) + { + $set[] = "$key = ?"; + } + $query .= implode(', ', $set); + + if ($where !== '') + { + $query .= $where; + } + + $stmt = mysqli_prepare($this->db_connect_id, $query); + } + + // get the stmt onto the top of the function arguments + array_unshift($data, $stmt); + + call_user_func_array('mysqli_stmt_bind_param', $data); + mysqli_stmt_execute($stmt); + + mysqli_stmt_close($stmt); + } + + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index fc7d177377..09648d9841 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -514,6 +514,39 @@ class dbal_oracle extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type === 'INSERT') + { + $stmt = oci_parse($this->db_connect_id, "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES (:" . implode(', :', array_keys($data)) . ')'); + } + else + { + $query = "UPDATE $table SET "; + + $set = array(); + foreach (array_keys($data) as $key) + { + $set[] = "$key = :$key"; + } + $query .= implode(', ', $set); + + if ($where !== '') + { + $query .= $where; + } + + $stmt = oci_parse($this->db_connect_id, $query); + } + + foreach ($data as $column => $value) + { + oci_bind_by_name($stmt, ":$column", $data[$column], -1); + } + + oci_execute($stmt); + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index 0cce581558..f4237999ff 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -334,6 +334,41 @@ class dbal_postgres extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + // for now, stmtname is an empty string, it might change to something more unique in the future + if ($type === 'INSERT') + { + $stmt = pg_prepare($this->dbms_type, '', "INSERT INTO $table (". implode(', ', array_keys($data)) . ") VALUES ($" . implode(', $', range(1, sizeof($data))) . ')'); + } + else + { + $query = "UPDATE $table SET "; + + $set = array(); + foreach (array_keys($data) as $key_id => $key) + { + $set[] = $key . ' = $' . $key_id; + } + $query .= implode(', ', $set); + + if ($where !== '') + { + $query .= $where; + } + + $stmt = pg_prepare($this->db_connect_id, '', $query); + } + + // add the stmtname to the top + array_unshift($data, ''); + + // add the connection resource + array_unshift($data, $this->db_connect_id); + + call_user_func_array('pg_execute', $data); + } + /** * Build LIKE expression * @access private diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php index 580a9fb1fb..64621496c4 100644 --- a/phpBB/includes/db/sqlite.php +++ b/phpBB/includes/db/sqlite.php @@ -258,6 +258,21 @@ class dbal_sqlite extends dbal } } + function sql_handle_data($type, $table, $data, $where = '') + { + if ($type === 'UPDATE') + { + $this->sql_query('INSERT INTO ' . $table . ' ' . + $this->sql_build_array('INSERT', $data)); + } + else + { + $this->sql_query('UPDATE ' . $table . ' + SET ' . $db->sql_build_array('UPDATE', $data) . + $where); + } + } + /** * return sql error array * @access private diff --git a/phpBB/style.php b/phpBB/style.php index 2bc6930a5c..c0f8ed7352 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -196,6 +196,7 @@ if ($id) 'theme_data' => $theme['theme_data'] ); + // @TODO: rewrite with the new param db functions $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE theme_id = $id"; $db->sql_query($sql);