Merge branch 'dev' of 192.168.1.251:connector-php into dev

11 files changed, 150 insertions, 5 deletions

diff --git a/codebase/base_connector.php b/codebase/base_connector.php
index 76351b9..451c61d 100644
--- a/codebase/base_connector.php
+++ b/codebase/base_connector.php
@@ -230,7 +230,7 @@ class DataItem{
 		@return 
 			escaped string
 	*/
-	protected function xmlentities($string) { 
+	public function xmlentities($string) { 
    		return str_replace( array( '&', '"', "'", '<', '>', '’' ), array( '&amp;' , '&quot;', '&apos;' , '&lt;' , '&gt;', '&apos;' ), $string);
 	}
 	
@@ -387,6 +387,12 @@ class Connector {
 		$this->request->parse_sql($sql);
 		return $this->render();
 	}
+
+	public function render_complex_sql($sql,$id,$fields,$extra=false,$relation_id=false){
+		$this->config->init($id,$fields,$extra,$relation_id);
+		$this->request->parse_sql($sql, true);
+		return $this->render();
+	}	
 	
 	/*! render already configured connector
 		
diff --git a/codebase/db_common.php b/codebase/db_common.php
index a37d54d..996feda 100644
--- a/codebase/db_common.php
+++ b/codebase/db_common.php
@@ -215,14 +215,28 @@ class DataRequestConfig{
 		@param sql
 			incoming sql string
 	*/
-	public function parse_sql($sql){
-		$sql= preg_replace("/[ \n\t]+limit[\n ,0-9]/i","",$sql);
+	public function parse_sql($sql, $as_is = false){
+		if ($as_is){
+			$this->fieldset = $sql;
+			return;
+		}
+
+		$sql= preg_replace("/[ \n\t]+limit[\n\t ,0-9]*$/i","",$sql);
 		
 		$data = preg_split("/[ \n\t]+\\_from\\_/i",$sql,2);
 		if (count($data)!=2)
 			$data = preg_split("/[ \n\t]+from/i",$sql,2);
 		$this->fieldset = preg_replace("/^[\s]*select/i","",$data[0],1);
-		
+
+		//Ignore next type of calls
+		//direct call to stored procedure without FROM
+		if ((count($data) == 1) ||
+			//UNION select
+			preg_match("#[ \n\r\t]union[ \n\t\r]#i", $sql)){
+				$this->fieldset = $sql;
+				return;
+		}
+
 	  	$table_data = preg_split("/[ \n\t]+where/i",$data[1],2);
 	  	/*
 		  		if sql code contains group_by we will place all sql query in the FROM 
@@ -719,6 +733,9 @@ abstract class DBDataWrapper extends DataWrapper{
 			sql string for select operation
 	*/
 	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
 		$sql="SELECT ".$select." FROM ".$from;
 		if ($where) $sql.=" WHERE ".$where;
 		if ($sort) $sql.=" ORDER BY ".$sort;
diff --git a/codebase/db_mssql.php b/codebase/db_mssql.php
index e082c03..0bbcf63 100644
--- a/codebase/db_mssql.php
+++ b/codebase/db_mssql.php
@@ -43,6 +43,9 @@ class MsSQLDBDataWrapper extends DBDataWrapper{
 	}		
 	
 	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
 		$sql="SELECT " ;
 		if ($count)
 			$sql.=" TOP ".($count+$start);
diff --git a/codebase/db_oracle.php b/codebase/db_oracle.php
index 5dcbd71..210af43 100644
--- a/codebase/db_oracle.php
+++ b/codebase/db_oracle.php
@@ -58,6 +58,9 @@ class OracleDBDataWrapper extends DBDataWrapper{
 	}		
 	
 	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
 		$sql="SELECT ".$select." FROM ".$from;
 		if ($where) $sql.=" WHERE ".$where;
 		if ($sort) $sql.=" ORDER BY ".$sort;
diff --git a/codebase/db_pdo.php b/codebase/db_pdo.php
index 281b23d..c008adb 100644
--- a/codebase/db_pdo.php
+++ b/codebase/db_pdo.php
@@ -15,12 +15,18 @@ class PDODBDataWrapper extends DBDataWrapper{
 		LogMaster::log($sql);
 		
 		$res=$this->connection->query($sql);
-		if ($res===false) throw new Exception("PDO - sql execution failed\n".$this->connection->errorInfo());
+		if ($res===false) {
+			$message = $this->connection->errorInfo();
+			throw new Exception("PDO - sql execution failed\n".$message[2]);
+		}
 		
 		return new PDOResultSet($res);
 	}
 
 	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
 		$sql="SELECT ".$select." FROM ".$from;
 		if ($where) $sql.=" WHERE ".$where;
 		if ($sort) $sql.=" ORDER BY ".$sort;
diff --git a/codebase/db_postgre.php b/codebase/db_postgre.php
index f944714..011bd47 100644
--- a/codebase/db_postgre.php
+++ b/codebase/db_postgre.php
@@ -17,6 +17,9 @@ class PostgreDBDataWrapper extends DBDataWrapper{
 	}
 	
 	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
 		$sql="SELECT ".$select." FROM ".$from;
 		if ($where) $sql.=" WHERE ".$where;
 		if ($sort) $sql.=" ORDER BY ".$sort;
diff --git a/codebase/db_sasql.php b/codebase/db_sasql.php
new file mode 100644
index 0000000..85959df
--- /dev/null
+++ b/codebase/db_sasql.php
@@ -0,0 +1,54 @@
+<?php
+require_once("db_common.php");
+/*! SaSQL implementation of DataWrapper
+**/
+class SaSQLDBDataWrapper extends DBDataWrapper{
+	private $last_id=""; //!< ID of previously inserted record
+
+	public function query($sql){
+		LogMaster::log($sql);
+		$res=sasql_query($this->connection, $sql);
+		if ($res===false) throw new Exception("SaSQL operation failed\n".sasql_error($this->connection));
+		$this->last_result = $res;
+		return $res;
+	}
+	
+	public function get_next($res){
+		if (!$res)
+			$res = $this->last_result;
+			
+		return sasql_fetch_assoc($res);
+	}
+	
+	protected function get_new_id(){
+		return sasql_insert_id($this->connection);
+	}
+	
+	protected function insert_query($data,$request){
+		$sql = parent::insert_query($data,$request);
+		$this->insert_operation=true;
+		return $sql;
+	}		
+	
+	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
+		$sql="SELECT " ;
+		if ($count)
+			$sql.=" TOP ".($count+$start);
+		$sql.=" ".$select." FROM ".$from;
+		if ($where) $sql.=" WHERE ".$where;
+		if ($sort) $sql.=" ORDER BY ".$sort;
+		return $sql;
+	}
+
+	public function escape($data){
+		return sasql_escape_string($this->connection, $data);
+	}
+	
+	public function begin_transaction(){
+		$this->query("BEGIN TRAN");
+	}
+}
+?>
\ No newline at end of file
diff --git a/codebase/db_sqlsrv.php b/codebase/db_sqlsrv.php
index c0f9299..597a74d 100644
--- a/codebase/db_sqlsrv.php
+++ b/codebase/db_sqlsrv.php
@@ -60,6 +60,9 @@ class SQLSrvDBDataWrapper extends DBDataWrapper{
 	}		
 	
 	protected function select_query($select,$from,$where,$sort,$start,$count){
+		if (!$from)
+			return $select;
+			
 		$sql="SELECT " ;
 		if ($count)
 			$sql.=" TOP ".($count+$start);
diff --git a/samples/config.php b/samples/config.php
index 719e327..79d6843 100644
--- a/samples/config.php
+++ b/samples/config.php
@@ -9,4 +9,6 @@
 	$postrgre_connection = "host=localhost port=5432 dbname=sampleDB user=root password=1234";
 	//necessary for Oracle related samples only 
 	$oci_connection = "some here";
+	//necessart for SQL Anywhere connection
+	$sasql_conn = "uid=DBA;pwd=sql";
 ?>
\ No newline at end of file
diff --git a/samples/grid/xx_sample_sasql.html b/samples/grid/xx_sample_sasql.html
new file mode 100644
index 0000000..4d8b958
--- /dev/null
+++ b/samples/grid/xx_sample_sasql.html
@@ -0,0 +1,37 @@
+ 

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+<html>

+<head>

+	<title>For demo purpose only :: &1</title>

+

+

+

+

+<script src="../common/dhtmlx.js" type="text/javascript" charset="utf-8"></script>

+<script src="../../codebase/connector.js" type="text/javascript" charset="utf-8"></script>

+<link rel="stylesheet" href="../common/dhtmlx.css" type="text/css" charset="utf-8">

+</head>

+<body>

+				<div id="gridbox" width="350px" height="550px" style="background-color:white;overflow:hidden"></div>

+<script>

+	mygrid = new dhtmlXGridObject('gridbox');

+	mygrid.setImagePath("../common/imgs/");

+	mygrid.setHeader("Column A, Column B");

+	mygrid.attachHeader("#connector_text_filter,#connector_text_filter")

+	mygrid.setInitWidths("100,*")

+	mygrid.setColTypes("edtxt,ed");

+	mygrid.setColSorting("connector,connector")

+	mygrid.enableSmartRendering(true)

+	mygrid.enableMultiselect(true)

+	mygrid.init();

+	mygrid.loadXML("xx_sample_sasql_connector.php");

+	var dp = new dataProcessor("xx_sample_sasql_connector.php");

+	dp.init(mygrid);

+</script>

+<input type="button" name="add" value="add row" onclick="var id=mygrid.uid(); mygrid.addRow(id,'',0); mygrid.showRow(id);">

+<input type="button" name="delete" value="delete row" onclick="mygrid.deleteSelectedRows()">

+<div class='code'><code><span style="color: #000000">
+<span style="color: #0000BB">&lt;?php
<br />&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #007700">require_once(</span><span style="color: #DD0000">"../config.php"</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">$res</span><span style="color: #007700">=</span><span style="color: #0000BB">pg_connect</span><span style="color: #007700">(</span><span style="color: #0000BB">$postrgre_connection</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;require(</span><span style="color: #DD0000">"../../codebase/grid_connector.php"</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;require(</span><span style="color: #DD0000">"../../codebase/db_postgre.php"</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">$grid&nbsp;</span><span style="color: #007700">=&nbsp;new&nbsp;</span><span style="color: #0000BB">GridConnector</span><span style="color: #007700">(</span><span style="color: #0000BB">$res</span><span style="color: #007700">,</span><span style="color: #DD0000">"Postgre"</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">$grid</span><span style="color: #007700">-&gt;</span><span style="color: #0000BB">enable_log</span><span style="color: #007700">(</span><span style="color: #DD0000">"temp.log"</span><span style="color: #007700">,</span><span style="color: #0000BB">true</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">$grid</span><span style="color: #007700">-&gt;</span><span style="color: #0000BB">dynamic_loading</span><span style="color: #007700">(</span><span style="color: #0000BB">100</span><span style="color: #007700">);
<br />&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">$grid</span><span style="color: #007700">-&gt;</span><span style="color: #0000BB">render_table</span><span style="color: #007700">(</span><span style="color: #DD0000">"grid50000"</span><span style="color: #007700">,</span><span style="color: #DD0000">""</span><span style="color: #007700">,</span><span style="color: #DD0000">"item_nm,item_cd"</span><span style="color: #007700">);
<br /></span><span style="color: #0000BB">?&gt;</span>
+</span>
+</code></div></body>

+</html>

diff --git a/samples/grid/xx_sample_sasql_connector.php b/samples/grid/xx_sample_sasql_connector.php
new file mode 100644
index 0000000..798f84f
--- /dev/null
+++ b/samples/grid/xx_sample_sasql_connector.php
@@ -0,0 +1,11 @@
+<?php
+	require_once("../config.php");
+	$res = sasql_connect($sasql_conn); 
+
+	require("../../codebase/grid_connector.php");
+	require("../../codebase/db_sasql.php");
+	$grid = new GridConnector($res, "SaSQL");
+	$grid->enable_log("temp.log",true);
+	$grid->dynamic_loading(100);
+	$grid->render_table("Contacts","ID","Surname,GivenName,Title");
+?>
\ No newline at end of file