Mercurial > hg > monetdb-php

changeset 3:74ca89377328

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed trailing white space.
author Sjoerd Mullender <sjoerd@acm.org>
date Wed, 14 Sep 2016 16:04:49 +0200 (2016-09-14)
parents 94e0ca7bc206
children 4c17d4bb7f22
files INSTALL README examples/simple_query.php lib/php_monetdb.php
diffstat 4 files changed, 130 insertions(+), 130 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL
+++ b/INSTALL
@@ -13,7 +13,7 @@ You can verify wether your interpreter h
 
 and check for the presence of the "--enable-sockets" option.
 
-In order to enable sockets support in your php interpreter; 
+In order to enable sockets support in your php interpreter;
 load the php_sockets.so library from the php.ini configuration file.
 
 
--- a/README
+++ b/README
@@ -17,4 +17,4 @@ The php API aims at being compatible wit
 
 A comparison between cimpl and native can be found at: http://www.ins.cwi.nl/~gm/bench/
 
-php_test.tar.bz2 - contains an utility to measure the performance of the two php APIS.	
+php_test.tar.bz2 - contains an utility to measure the performance of the two php APIS.
--- a/examples/simple_query.php
+++ b/examples/simple_query.php
@@ -23,7 +23,7 @@
 	{
 		$db = monetdb_connect($lang = "sql", $host = "127.0.0.1", $port = "50000" , $username = "monetdb", $password = "monetdb", $database = "php_demo" )
 		or die(monetdb_last_error());
-		
+
 		$sql = monetdb_escape_string($_POST['query']);
 		$res = monetdb_query($sql);
 		while ( $row = monetdb_fetch_assoc($res) )
@@ -32,7 +32,7 @@
 			print_r($row);
 			print "</pre>\n";
 		}
-		
+
 		monetdb_disconnect();
 	}
 
@@ -42,7 +42,7 @@
 	value=\"{$_POST['query']}\" />\n";
 	print "<input type=\"submit\" value=\"Execute\" />\n";
 	print "</form>\n";
-?>	
+?>
 
 </body>
 
--- a/lib/php_monetdb.php
+++ b/lib/php_monetdb.php
@@ -12,7 +12,7 @@
 	* Implementation of the driver API.
 	*
 	* This library relies on the native PHP mapi implementation.
-	* 
+	*
 	* This file should be included by all pages that want to make use of a
  	* database connection.
 	*
@@ -23,71 +23,26 @@
     * function monetdb_connected() *
 	* function monetdb_query($query)  *
 	* function monetdb_fetch_assoc($hdl) *
-	* function monetdb_fetch_object($hdl) 
+	* function monetdb_fetch_object($hdl)
 	* function monetdb_num_rows($hdl)  *
-	* function monetdb_affected_rows($hdl) * 
+	* function monetdb_affected_rows($hdl) *
 	* function monetdb_last_error()  *
 	* function monetdb_insert_id($seq)  *
 	* function monetdb_quote_ident($str) *
-	* function monetdb_escape_string($str) * 
+	* function monetdb_escape_string($str) *
 	**/
 
 	/**
 	* php_mapi.inc is a native (socket based) php implementation of the MAPI communication protocol.
 	*/
 	require 'php_mapi.inc';
-	
+
 	/**
 	* register a 'monetdb' extension to retain compatibility with wht Cimpl based scripts.
 	*/
-	
-	/**
-	 * Opens a connection to a MonetDB server.  
-	 * 
-	 * @param string language to be used (sql)
-	 * @param string hostname to connect to (default is localhost)
-	 * @param int    port to use (default is 50000)
-	 * @param string username (default is monetdb)
-	 * @param string password (default is monetdb)
-	 * @param string database to use (default is demo)
-	 * @param string hash function to use during authentication (defaults to SHA1) 
-	 * @return bool TRUE on success or FALSE on failure 
-	 */
-	
-	function monetdb_connect($lang = "sql", $host = "127.0.0.1", $port = 50000, $username = "monetdb", $password = "monetdb", $database = "demo", $hashfunc = "") {
-	 	$options["host"] = $host;
-		$options["port"] = $port;
-
-		$options["username"] = $username;
-		$options["password"] = $password;
-		
-		$options["database"] = $database; 
-		$options["persistent"] = FALSE;
-	
-	
-	    if ($hashfunc == "") {
-		    $hashfunc = "sha1";
-	    }
-	    
-	    if ($lang == "") {
-	        $lang = "sql";
-	    }
-	    
-	    $options["hashfunc"] = $hashfunc;
-        $options["lang"]     = $lang;
-				
-		return mapi_connect_proxy($options);
-	}
 
 	/**
-	 * Opens a persistent connection to a MonetDB server.  
-	 * First, when connecting, the function would first try to find a (persistent) link that's already open with the same host, 
-	 * username and password. If one is found, an identifier for it will be returned instead of opening a new connection.
-	 *
-	 * Second, the connection to the SQL server will not be closed when the execution of the script ends. 
-	 * Instead, the link will remain open for future use (monetdb_close() will not close links established by monetdb_pconnect()).
-	 *
-	 * This type of link is therefore called 'persistent'. 
+	 * Opens a connection to a MonetDB server.
 	 *
 	 * @param string language to be used (sql)
 	 * @param string hostname to connect to (default is localhost)
@@ -96,9 +51,54 @@
 	 * @param string password (default is monetdb)
 	 * @param string database to use (default is demo)
 	 * @param string hash function to use during authentication (defaults to SHA1)
-	 * @return bool TRUE on success or FALSE on failure 
+	 * @return bool TRUE on success or FALSE on failure
 	 */
-	
+
+	function monetdb_connect($lang = "sql", $host = "127.0.0.1", $port = 50000, $username = "monetdb", $password = "monetdb", $database = "demo", $hashfunc = "") {
+	 	$options["host"] = $host;
+		$options["port"] = $port;
+
+		$options["username"] = $username;
+		$options["password"] = $password;
+
+		$options["database"] = $database;
+		$options["persistent"] = FALSE;
+
+
+	    if ($hashfunc == "") {
+		    $hashfunc = "sha1";
+	    }
+
+	    if ($lang == "") {
+	        $lang = "sql";
+	    }
+
+	    $options["hashfunc"] = $hashfunc;
+        $options["lang"]     = $lang;
+
+		return mapi_connect_proxy($options);
+	}
+
+	/**
+	 * Opens a persistent connection to a MonetDB server.
+	 * First, when connecting, the function would first try to find a (persistent) link that's already open with the same host,
+	 * username and password. If one is found, an identifier for it will be returned instead of opening a new connection.
+	 *
+	 * Second, the connection to the SQL server will not be closed when the execution of the script ends.
+	 * Instead, the link will remain open for future use (monetdb_close() will not close links established by monetdb_pconnect()).
+	 *
+	 * This type of link is therefore called 'persistent'.
+	 *
+	 * @param string language to be used (sql)
+	 * @param string hostname to connect to (default is localhost)
+	 * @param int    port to use (default is 50000)
+	 * @param string username (default is monetdb)
+	 * @param string password (default is monetdb)
+	 * @param string database to use (default is demo)
+	 * @param string hash function to use during authentication (defaults to SHA1)
+	 * @return bool TRUE on success or FALSE on failure
+	 */
+
   function monetdb_pconnect($lang = "sql", $host = "127.0.0.1", $port = 500000, $username = "monetdb", $password = "monetdb", $database = "demo", $hashfunc = "") {
 
 	 	$options["host"] = $host;
@@ -106,22 +106,22 @@
 
 		$options["username"] = $username;
 		$options["password"] = $password;
-		$options["database"] = $database; 
+		$options["database"] = $database;
 		$options["persistent"] = TRUE;
-		
+
 		if ($hashfunc == "") {
 		    $hashfunc = "sha1";
 	    }
-	    
+
 	    if ($lang == "") {
 	        $lang = "sql";
 		} else if (strstr($lang, "sql") == $lang) {
 			$lang = "sql";
 		}
-	    
+
 	    $options["hashfunc"] = $hashfunc;
         $options["lang"]     = $lang;
-		
+
 		return mapi_connect_proxy($options);
 	}
 
@@ -132,7 +132,7 @@
 	 */
 	function monetdb_disconnect($conn=NULL) {
 		$num_args = func_num_args();
-		
+
 		if ($num_args == 0) {
 			$conn = mapi_get_current_conn();
 			mapi_close(NULL);
@@ -140,7 +140,7 @@
 			mapi_close($conn);
 		}
 	}
-	
+
 	/**
 	 * Returns whether a connection to the database has been made, and has
 	 * not been closed yet.  Note that this function doesn't guarantee that
@@ -152,14 +152,14 @@
 	 */
 	function monetdb_connected($connection=NULL) {
 		$num_args = func_num_args();
-		
+
 		if ($num_args == 0){
 			return mapi_connected(mapi_get_current_conn());
 		}
-		
+
 		return mapi_connected($connection);
 	}
-	
+
 	/**
 	 * Executes the given query on the database.
 	 *
@@ -169,23 +169,23 @@
 	 */
 	function monetdb_query($connection=NULL, $query="") {
 		$num_args = func_num_args();
-		
+
 		if ($num_args == 1){
 			$arg = func_get_arg(0);
 			if (is_string($arg)) {
 				$conn = mapi_get_current_conn();
 				if ($conn != NULL) {
 					return mapi_execute($conn, $arg);
-				} 
+				}
 			}
-			
+
 		} else {
 			return mapi_execute($connection, $query);
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	 * Returns the number of rows in the query result.
 	 *
@@ -205,7 +205,7 @@
 	 *
 	 * @param resouce the query resource
 	 * @return int the number of fields in the result; FALSE if the query did not return any result set
-	 */	
+	 */
 	function monetdb_num_fields($hdl) {
     	if ($hdl["operation"] == Q_TABLE || $hdl["operation"] == Q_BLOCK ) {
   			return $hdl["query"]["fields"];
@@ -213,28 +213,28 @@
   			return FALSE;
   		}
 	}
-	
+
 	/**
-	 * Returns an array containing column values as value. 
+	 * Returns an array containing column values as value.
 	 * For efficiency reasons the array pointer is not reset when calling monetdb_fetch_row
-	 * specifying a row value. 
+	 * specifying a row value.
 	 *
 	 * @param resource the query handle
 	 * @param int the position of the row to retrieve
 	 * @return array the next row in the query result as associative array or
 	 *         FALSE if no more rows exist
 	 */
-	function monetdb_fetch_row(&$hdl, $row=-1) {	
+	function monetdb_fetch_row(&$hdl, $row=-1) {
 		global $last_error;
-		
+
 		if ($hdl["operation"] != Q_TABLE && $hdl["operation"] != Q_BLOCK ) {
 			return FALSE;
 		}
-	
+
 		if ($row == -1){
 		  // Parse the tuple and present it to the user
 			$entry = current($hdl["record_set"]);
-			
+
 			//advance the array of one position
 			next($hdl["record_set"]);
 
@@ -247,16 +247,16 @@
 				$last_error = "Index out of bound\n";
 				return FALSE;
 			}
-		}	
-		
+		}
+
     if ($entry) {
 		  return php_parse_row($entry);
 	  }
-	  
+
 	  return $entry;
 	}
 
-	
+
 	/**
 	 * Returns an associative array containing the column names as keys, and
 	 * column values as value.
@@ -265,20 +265,20 @@
 	 * @param int the position of the row to retrieve
 	 * @return array the next row in the query result as associative array or
 	 *         FALSE if no more rows exist
-	 */	
+	 */
 	function monetdb_fetch_assoc(&$hdl, $row=-1) {
 		if ($hdl["operation"] != Q_TABLE && $hdl["operation"] != Q_BLOCK ) {
 			return FALSE;
 		}
-		
+
 		// first retrieve the row as an array
 		$fetched_row =  monetdb_fetch_row($hdl, $row);
-		
+
 		if ($fetched_row == FALSE) {
 			return FALSE;
 		}
-		
-		// now hash the array by field name		
+
+		// now hash the array by field name
 		$hashed = array();
 
 		$i = 0;
@@ -287,7 +287,7 @@
 			$hashed[$field] = $fetched_row[$i];
 			$i++;
 		}
-		
+
 		return $hashed;
 	}
 
@@ -302,15 +302,15 @@
 	 * @return the query result as object or FALSE if there are no more rows
 	 */
 	function monetdb_fetch_object(&$hdl, $row=-1)  {
-		
+
 		if ($hdl["operation"] != Q_TABLE && $hdl["operation"] != Q_BLOCK ) {
 			return FALSE;
 		}
-		
+
 		if (($row_array =  monetdb_fetch_assoc($hdl, $row)) == FALSE) {
 			return FALSE;
 		}
-		
+
 		$row_object = new stdClass();
 		if (is_array($row_array) && count($row_array) > 0) {
 			foreach ($row_array as $name=>$value) {
@@ -320,10 +320,10 @@
 		        }
 		     }
 		 }
-		
+
 		return $row_object;
 	}
-	
+
 	/**
 	* Returns the name of the field at position $field
 	*
@@ -338,10 +338,10 @@
                     return $hdl["header"]["fields"][$field];
                 }
 		    }
-    	}	
+    	}
     	return FALSE;
 	}
-	
+
 	/**
 	 * Returns the number of affected rows for an UPDATE, INSERT or DELETE
 	 * query.  The number of affected rows typically is 1 for INSERT
@@ -349,16 +349,16 @@
 	 *
 	 * @param resource the query handle
 	 * @return int the number of affected rows, FALSE if the last executed query did not affect any row.
-	 */	
+	 */
 	function monetdb_affected_rows($hdl) {
 		if ($hdl["operation"] != Q_UPDATE) {
 			return FALSE;
-		} 
-		
+		}
+
 		return $hdl["query"]["affected"];
 	}
-	
-	
+
+
 	/**
 	* Check if the query handle contains a result set. Note: the result set may be empty.
 	*
@@ -369,10 +369,10 @@
 	    if (($hdl["operation"] == Q_TABLE) || ($hdl["operation"] == Q_BLOCK)) {
 	        return TRUE;
 	    }
-	    
+
 	    return FALSE;
 	}
-	
+
 	/**
 	 * Returns the last error reported by the database.
 	 *
@@ -382,7 +382,7 @@
 		global $last_error;
 		return $last_error;
 	}
-	
+
 	/**
 	 * Generates the next id in the sequence $seq
 	 *
@@ -393,22 +393,22 @@
 	 */
 	function monetdb_insert_id($connection = NULL, $seq)  {
 		$num_args = func_num_args();
-		
+
 		if ($num_args == 1) {
 			$connection = mapi_get_current_conn();
 			$seq = func_get_arg(0);
 		}
-		
+
 		if (is_string($seq)) {
 			$query = "SELECT NEXT VALUE FOR ".monetdb_quote_ident($seq)."";
 			$res = monetdb_query($connection, $query);
 			$row = monetdb_fetch_assoc($result);
             return($row[$seq]);
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	 * Returns a 'quoted identifier' suitable for MonetDB.
 	 * This utility function can be used in queries to for instance quote
@@ -435,10 +435,10 @@
 	function monetdb_escape_string($str) {
 		return mapi_quote($str, strlen($str));
 	}
-	
+
 	/**
 	* Free the result set memory.
-	* 
+	*
 	* @param resource the query handle.
 	* @return bool returns TRUE on success or FALSE on failure.
 	*
@@ -449,28 +449,28 @@
 
 		/* Release the result set on server */
 		mapi_free_result($conn_id, $res_id);
-		
-		
+
+
 		if (isset($hdl) && is_array($hdl)) {
 			foreach($hdl as $field) {
 				if (isset($field)) {
 					unset($field);
 				}
 			}
-			
+
 			unset($hdl);
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-		
-	
-	/* 
+
+
+	/*
 	 * These functions are not present in the original Cimpl implementation
 	 */
-	
+
 	/**
 	* Create a new savepoint ID
 	* @param resource connection instance
@@ -479,27 +479,27 @@
 	function create_savepoint(&$conn) {
 		if ($conn != NULL) {
 			$index = count($conn["transactions"]);
-		
+
 			$id = "monetdbsp" . $index;
 			array_push($conn["transactions"], $id);
-			
+
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
-	
+
 	/**
 	* Release a savepoint ID.
 	* @param resource connection instance
 	* @return bool TRUE if the ID has been correctly released, FALSE otherwise.
 	*/
 	function release_savepoint(&$conn) {
-		if ($conn != NULL) { 
+		if ($conn != NULL) {
 			array_pop($conn["transactions"]);
 			return TRUE;
 		}
-		
+
 		return FALSE;
 	}
 
@@ -512,7 +512,7 @@
 		if (count($conn["transactions"]) == 0) {
 			return FALSE;
 		}
-		
+
 		// return the last element in the array
 		return $conn["transactions"][count($conn["transactions"])-1];
 	}
@@ -528,10 +528,10 @@
 			$cmd = "auto_commit " . (int) $flag;
 			mapi_write($conn["socket"], format_command($cmd));
 			mapi_read($conn["socket"]);
-			
+
 			return TRUE;
 		}
 		return FALSE;
 	}
-	
+
 ?>