detain / db_abstraction

src/Pgsql/Db.php

Braces +25 added lines, -50 removed lines

@@ -17,8 +17,7 @@ 
  *
  * @access public
  */
-class Db extends Generic implements Db_Interface
-{
+class Db extends Generic implements Db_Interface {
 	/* public: this is an api revision, not a CVS revision. */
 	public $type = 'pgsql';
 	public $port = '';
@@ -33,8 +32,7 @@ 
 	 * @param false|string $quote optional indicate the value needs quoted
 	 * @return string
 	 */
-	public function ifadd($add, $me, $quote = false)
-	{
+	public function ifadd($add, $me, $quote = false) {
 		if ('' != $add) {
 			return ' '.$me.($quote === false ? '' : $quote).$add.($quote === false ? '' : $quote);
 		}
@@ -45,8 +43,7 @@ 
 	 * @param $string
 	 * @return string
 	 */
-	public function real_escape($string = '')
-	{
+	public function real_escape($string = '') {
 		return $this->escape($string);
 	}
 
@@ -56,8 +53,7 @@ 
 	 * @param string $database the name of the database to use
 	 * @return void
 	 */
-	public function useDb($database)
-	{
+	public function useDb($database) {
 		$this->selectDb($database);
 	}
 
@@ -67,8 +63,7 @@ 
 	 * @param string $database the name of the database to use
 	 * @return void
 	 */
-	public function selectDb($database)
-	{
+	public function selectDb($database) {
 		/*if ($database != $this->database) {
 			$this->database = $database;
 			$this->linkId = null;
@@ -80,8 +75,7 @@ 
 	 * Db::connect()
 	 * @return void
 	 */
-	public function connect()
-	{
+	public function connect() {
 		if (0 == $this->linkId) {
 			$connectString = trim($this->ifadd($this->host, 'host=').
 							 $this->ifadd($this->port, 'port=').
@@ -101,8 +95,7 @@ 
 	 * Db::disconnect()
 	 * @return bool
 	 */
-	public function disconnect()
-	{
+	public function disconnect() {
 		return @pg_close($this->linkId);
 	}
 
@@ -117,8 +110,7 @@ 
 	 * @param string $file optionally pass __FILE__ calling the query for logging
 	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
 	 */
-	public function queryReturn($query, $line = '', $file = '')
-	{
+	public function queryReturn($query, $line = '', $file = '') {
 		$this->query($query, $line, $file);
 		if ($this->num_rows() == 0) {
 			return false;
@@ -144,8 +136,7 @@ 
 	 * @param string $file optionally pass __FILE__ calling the query for logging
 	 * @return mixed FALSE if no rows, if a single row it returns that, if multiple it returns an array of rows, associative responses only
 	 */
-	public function qr($query, $line = '', $file = '')
-	{
+	public function qr($query, $line = '', $file = '') {
 		return $this->queryReturn($query, $line, $file);
 	}
 
@@ -159,8 +150,7 @@ 
 	 * @param string $file
 	 * @return mixed 0 if no query or query id handler, safe to ignore this return
 	 */
-	public function query($queryString, $line = '', $file = '')
-	{
+	public function query($queryString, $line = '', $file = '') {
 		/* No empty queries, please, since PHP4 chokes on them. */
 		/* The empty query string is passed on from the constructor,
 		* when calling the class without a query, e.g. in situations
@@ -191,8 +181,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function free()
-	{
+	public function free() {
 		@pg_freeresult($this->queryId);
 		$this->queryId = 0;
 	}
@@ -202,8 +191,7 @@ 
 	 * @param mixed $resultType
 	 * @return bool
 	 */
-	public function next_record($resultType = PGSQL_BOTH)
-	{
+	public function next_record($resultType = PGSQL_BOTH) {
 		$this->Record = @pg_fetch_array($this->queryId, $this->Row++, $resultType);
 
 		$this->Error = pg_errormessage($this->linkId);
@@ -223,8 +211,7 @@ 
 	 * @param mixed $pos
 	 * @return void
 	 */
-	public function seek($pos)
-	{
+	public function seek($pos) {
 		$this->Row = $pos;
 	}
 
@@ -233,8 +220,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function transactionBegin()
-	{
+	public function transactionBegin() {
 		return $this->query('begin');
 	}
 
@@ -242,8 +228,7 @@ 
 	 * Db::transactionCommit()
 	 * @return bool|mixed
 	 */
-	public function transactionCommit()
-	{
+	public function transactionCommit() {
 		if (!$this->Errno) {
 			return pg_exec($this->linkId, 'commit');
 		} else {
@@ -255,8 +240,7 @@ 
 	 * Db::transactionAbort()
 	 * @return mixed
 	 */
-	public function transactionAbort()
-	{
+	public function transactionAbort() {
 		return pg_exec($this->linkId, 'rollback');
 	}
 
@@ -266,8 +250,7 @@ 
 	 * @param mixed $field
 	 * @return int
 	 */
-	public function getLastInsertId($table, $field)
-	{
+	public function getLastInsertId($table, $field) {
 		/* This will get the last insert ID created on the current connection.  Should only be called
 		* after an insert query is run on a table that has an auto incrementing field.  Of note, table
 		* and field are required because pgsql returns the last inserted OID, which is unique across
@@ -304,8 +287,7 @@ 
 	 * @param string $mode
 	 * @return int|mixed
 	 */
-	public function lock($table, $mode = 'write')
-	{
+	public function lock($table, $mode = 'write') {
 		$result = $this->transactionBegin();
 
 		if ($mode == 'write') {
@@ -327,8 +309,7 @@ 
 	 * Db::unlock()
 	 * @return bool|mixed
 	 */
-	public function unlock()
-	{
+	public function unlock() {
 		return $this->transactionCommit();
 	}
 
@@ -336,8 +317,7 @@ 
 	 * Db::affectedRows()
 	 * @return void
 	 */
-	public function affectedRows()
-	{
+	public function affectedRows() {
 		return pg_cmdtuples($this->queryId);
 	}
 
@@ -345,8 +325,7 @@ 
 	 * Db::num_rows()
 	 * @return int
 	 */
-	public function num_rows()
-	{
+	public function num_rows() {
 		return pg_numrows($this->queryId);
 	}
 
@@ -354,8 +333,7 @@ 
 	 * Db::num_fields()
 	 * @return int
 	 */
-	public function num_fields()
-	{
+	public function num_fields() {
 		return pg_numfields($this->queryId);
 	}
 
@@ -365,8 +343,7 @@ 
 	 * @param string $file
 	 * @return mixed|void
 	 */
-	public function haltmsg($msg, $line = '', $file = '')
-	{
+	public function haltmsg($msg, $line = '', $file = '') {
 		$this->log("Database error: $msg", $line, $file, 'error');
 		if ($this->Errno != '0' || $this->Error != '()') {
 			$this->log('PostgreSQL Error: '.pg_last_error($this->linkId), $line, $file, 'error');
@@ -379,8 +356,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function tableNames()
-	{
+	public function tableNames() {
 		$return = [];
 		$this->query("select relname from pg_class where relkind = 'r' and not relname like 'pg_%'");
 		$i = 0;
@@ -398,8 +374,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function indexNames()
-	{
+	public function indexNames() {
 		$return = [];
 		$this->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relkind ='i' ORDER BY relname");
 		$i = 0;