Skip to content

Fix #29 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 14, 2017
Merged

Fix #29 #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6961f9b
Merge branch 'master' into dev
nunomazer Mar 14, 2017
c179730
Fix the undefined offset to bind parameters, fix #29
nunomazer Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 67 additions & 54 deletions Database/SybaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,58 +120,71 @@ private function compileForSelect(Builder $builder, $bindings) {
}
$queryString = $this->queryStringForSelect($tables);
$queryRes = $this->getPdo()->query($queryString);
$types[$tables] = $queryRes->fetchAll(\PDO::FETCH_NAMED);
$types[$tables] = $queryRes->fetchAll(\PDO::FETCH_NAMED);

foreach ($types[$tables] as &$row) {
$tipos[strtolower($row['name'])] = $row['type'];
$tipos[strtolower($tables.'.'.$row['name'])] = $row['type'];

if (!empty($alias['alias'])) {
$tipos[strtolower($alias['alias'].'.'.$row['name'])] = $row['type'];
}
}
$wheres = [];
foreach($builder->wheres as $w){
switch($w['type']){
default:
array_push($wheres, $w);
break;
case "Nested":
$wheres += $w['query']->wheres;
break;
}
}
}
}

$wheres = [];

foreach($builder->wheres as $w){
switch($w['type']){
default:
array_push($wheres, $w);
break;
case "Nested":
$wheres += $w['query']->wheres;
break;
}
}

$i = 0;
for($ind = 0; $ind < count($wheres); $ind++ ){
$wheresCount = count($wheres);

for($ind = 0; $ind < $wheresCount; $ind++ ){
if(isset($wheres[$ind]['value']) && isset($tipos[strtolower($wheres[$ind]['column'])])){
if(in_array(strtolower($tipos[strtolower($wheres[$ind]['column'])]), $this->without_quotes)){
if(!is_null($bindings[$i])){
if (is_object($wheres[$ind]['value']) === false) {
if(in_array(strtolower($tipos[strtolower($wheres[$ind]['column'])]), $this->without_quotes)){
if(!is_null($bindings[$i])){
$new_binds[$i] = $bindings[$i]/1;
}else{
}else{
$new_binds[$i] = null;
}
}else{
$new_binds[$i] = (string)$bindings[$i];
}
}else{
$new_binds[$i] = (string)$bindings[$i];
$i++;
}
$i++;
}
}

$new_format[$tables] = [];
}

$wheres = (array)$builder->wheres;
$i = 0;
for ($ind = 0; $ind < count($wheres); $ind++ ) {
$wheresCount = count($wheres);

for ($ind = 0; $ind < $wheresCount; $ind++ ) {
if (isset($wheres[$ind]['value'])) {
if (in_array(strtolower($tipos[strtolower($wheres[$ind]['column'])]), $this->without_quotes)) {
if (!is_null($bindings[$i])) {
$new_binds[$i] = $bindings[$i]/1;
if (is_object($wheres[$ind]['value']) === false) {
if (in_array(strtolower($tipos[strtolower($wheres[$ind]['column'])]), $this->without_quotes)) {
if (!is_null($bindings[$i])) {
$new_binds[$i] = $bindings[$i]/1;
} else {
$new_binds[$i] = null;
}
} else {
$new_binds[$i] = null;
$new_binds[$i] = (string)$bindings[$i];
}
} else {
$new_binds[$i] = (string)$bindings[$i];
$i++;
}
$i++;
}
}

Expand All @@ -185,32 +198,32 @@ private function queryStringForSelect($tables)
return <<<QUERY
select a.name,
b.name AS customtype,
st.name as type
st.name as type
FROM {$explicitDB[0]}..syscolumns a, {$explicitDB[0]}..systypes b, {$explicitDB[0]}..systypes s, {$explicitDB[0]}..systypes st
WHERE a.usertype = b.usertype
WHERE a.usertype = b.usertype
AND s.usertype = a.usertype
AND s.type = st.type
AND st.name not in ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
AND st.usertype < 100
AND st.usertype < 100
AND object_name(a.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
QUERY;
} else {
return <<<QUERY
select a.name, st.name as type
FROM syscolumns a, systypes b, systypes s, systypes st
WHERE a.usertype = b.usertype
WHERE a.usertype = b.usertype
AND s.usertype = a.usertype
AND s.type = st.type
AND st.name not in ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
AND st.usertype < 100
AND st.usertype < 100
AND object_name(a.id) = '{$tables}'
QUERY;
}
}

/**
* Set new bindings with specified column types to Sybase
*
*
* @param string $query
* @param array $bindings
* @return mixed $new_binds
Expand Down Expand Up @@ -243,7 +256,7 @@ private function compileBindings($query, $bindings)
break;
default:
return $bindings;
break;
break;
}

$desQuery = array_intersect_key($matches, array_flip(array_filter(array_keys($matches), 'is_string')));
Expand Down Expand Up @@ -316,34 +329,34 @@ private function queryStringForCompileBindings($table)
$explicitDB = explode('..', $table);
if (isset($explicitDB[1])) {
return <<<QUERY
select a.name,
select a.name,
b.name AS customtype,
st.name as type
st.name as type
FROM {$explicitDB[0]}..syscolumns a, {$explicitDB[0]}..systypes b, {$explicitDB[0]}..systypes s, {$explicitDB[0]}..systypes st
WHERE a.usertype = b.usertype
WHERE a.usertype = b.usertype
AND s.usertype = a.usertype
AND s.type = st.type
AND st.name not in ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
AND st.usertype < 100
AND st.usertype < 100
AND object_name(a.id, db_id('{$explicitDB[0]}')) = '{$explicitDB[1]}'
QUERY;
} else {
return <<<QUERY
select a.name, st.name as type
FROM syscolumns a, systypes b, systypes s, systypes st
WHERE a.usertype = b.usertype
WHERE a.usertype = b.usertype
AND s.usertype = a.usertype
AND s.type = st.type
AND st.name not in ('timestamp', 'sysname', 'longsysname', 'nchar', 'nvarchar')
AND st.usertype < 100
AND st.usertype < 100
AND object_name(a.id) = '{$table}'
QUERY;
}
}

/**
* Set new bindings with specified column types to Sybase
*
*
* @param string $query
* @param array $bindings
* @return string $query
Expand All @@ -353,7 +366,7 @@ private function queryStringForCompileBindings($table)
// Detalhes: http://stackoverflow.com/questions/2718628/pdoparam-for-type-decimal
private function compileNewQuery($query, $bindings)
{
$newQuery = "";
$newQuery = "";
$bindings = $this->compileBindings($query, $bindings);
$partQuery = explode("?", $query);
for ($i = 0; $i<count($partQuery); $i++) {
Expand All @@ -372,13 +385,13 @@ private function compileNewQuery($query, $bindings)
}
}
$newQuery = str_replace( "[]", '' ,$newQuery);
return $newQuery;
return $newQuery;
}

public function compileOffset($offset, $query, $bindings = array(), $me)
{
$limit = $this->queryGrammar->getBuilder()->limit;
$from = explode(" ", $this->queryGrammar->getBuilder()->from)[0];
$from = explode(" ", $this->queryGrammar->getBuilder()->from)[0];
if (!isset($limit)) {
$limit = 999999999999999999999999999;
}
Expand All @@ -401,11 +414,11 @@ public function compileOffset($offset, $query, $bindings = array(), $me)
$this->getPdo()->query(str_replace(" from ", " into #tmpPaginate from ", $this->compileNewQuery($query, $bindings)));
$this->getPdo()->query("SELECT ".$res_primaries.", idTmp=identity(18) INTO #tmpTable FROM #tmpPaginate");
return $this->getPdo()->query("SELECT #tmpPaginate.*, #tmpTable.idTmp FROM #tmpTable INNER JOIN #tmpPaginate ON ".$where_primaries." WHERE #tmpTable.idTmp "
. "BETWEEN ".($offset+1) ." AND ". ($offset+$limit)
. "BETWEEN ".($offset+1) ." AND ". ($offset+$limit)
." ORDER BY #tmpTable.idTmp ASC")->fetchAll($me->getFetchMode());

}
}
}
private function queryStringForIdentity($from)
{
$explicitDB = explode('..', $from);
Expand All @@ -432,7 +445,7 @@ private function queryStringForPrimaries($from)
WHERE i.id = c.id AND c.colid <= i.keycnt AND i.id = object_id('".$from."')";
}
}

/**
* Run a select statement against the database.
*
Expand All @@ -455,9 +468,9 @@ public function select($query, $bindings = array(), $useReadPdo = true)
}
if ($offset > 0) {
return $this->compileOffset($offset, $query, $bindings, $me);
} else {
} else {
$result = [];
$statement = $this->getPdo()->query($this->compileNewQuery($query, $bindings));
$statement = $this->getPdo()->query($this->compileNewQuery($query, $bindings));
do {
$result+= $statement->fetchAll($me->getFetchMode());
} while ($statement->nextRowset());
Expand All @@ -467,7 +480,7 @@ public function select($query, $bindings = array(), $useReadPdo = true)
}


/**
/**
* @param string $query
* @param mixed array $bindings
* @return bool
Expand All @@ -484,7 +497,7 @@ public function statement($query, $bindings = array())
}

public function affectingStatement($query, $bindings = array())
{
{
return $this->run($query, $bindings, function($me, $query, $bindings)
{
if ($me->pretending()) {
Expand Down