Skip to content

Commit 8850598

Browse files
ratajsratajs
authored
Update smysql.php
1 parent e4694d4 commit 8850598

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎smysql.php

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -240,40 +240,40 @@ public function changeDB($newDB) {
240240
public function select($table, $order = "", $cols = "*", $limit = NULL, $flags = 129, $name = "select") {
241241
if(is_array($cols)) {
242242
foreach($cols as $k => $v) {
243-
if(gettype($k)!="integer")
244-
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
243+
if(gettype($k)!="integer")
244+
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
245245
else
246246
$cols[$k] = "`" . $v . "`";
247-
};
247+
};
248248
$colsValue = implode(", ", $cols);
249249
}
250250
else
251251
$colsValue = strval($cols);
252-
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
253-
if(!empty($order))
254-
$order = " ORDER BY `" . $order . "`" . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
252+
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
253+
if(!empty($order))
254+
$order = " ORDER BY `" . $order . "`" . (boolval($flags & self::ORDER_DESC) ? " DESC" : " ASC");
255255
return $this->query("
256256
SELECT $colsValue FROM `$table`$limitString$order
257257
", $flags, $name);
258258
}
259259

260260
public function selectWhere($table, $cond, $order = "", $cols = "*", $limit = NULL, $flags = 129, $name = "selectWhere") {
261-
$all = !boolval($cond & self::COND_OR);
261+
$all = !boolval($flags & self::COND_OR);
262262
if(is_array($cols)) {
263263
foreach($cols as $k => $v) {
264-
if(gettype($k)!="integer")
265-
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
264+
if(gettype($k)!="integer")
265+
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
266266
else
267267
$cols[$k] = "`" . $v . "`";
268-
};
268+
};
269269
$colsValue = implode(", ", $cols);
270270
}
271271
else
272272
$colsValue = strval($cols);
273273
$condString = $this->getCondString($cond, $all);
274-
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
274+
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
275275
if(!empty($order))
276-
$order = " ORDER BY `" . $order . "`" . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
276+
$order = " ORDER BY `" . $order . "`" . (boolval($flags & self::ORDER_DESC) ? " DESC" : " ASC");
277277
return $this->query("
278278
SELECT $colsValue FROM `$table` WHERE $condString$limitString$order
279279
", $flags, $name);
@@ -289,19 +289,19 @@ public function selectJoin($table, $join, $on, $order = "", $cols = "*", $limit
289289
};
290290
if(is_array($cols)) {
291291
foreach($cols as $k => $v) {
292-
if(gettype($k)!="integer")
293-
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
292+
if(gettype($k)!="integer")
293+
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
294294
else
295295
$cols[$k] = "`" . $v . "`";
296-
};
296+
};
297297
$colsValue = implode(", ", $cols);
298298
}
299299
else
300300
$colsValue = strval($cols);
301301
$onString = $this->getCondString($on, $all, true);
302-
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
303-
if(!empty($order))
304-
$order = " ORDER BY `" . $order . "` " . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
302+
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
303+
if(!empty($order))
304+
$order = " ORDER BY `" . $order . "` " . (boolval($flags & self::ORDER_DESC) ? " DESC" : " ASC");
305305
return $this->query("
306306
SELECT $colsValue
307307
FROM `$table`
@@ -319,20 +319,20 @@ public function selectJoinWhere($table, $join, $on, $cond, $order = "", $cols =
319319
};
320320
if(is_array($cols)) {
321321
foreach($cols as $k => $v) {
322-
if(gettype($k)!="integer")
323-
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
322+
if(gettype($k)!="integer")
323+
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
324324
else
325325
$cols[$k] = "`" . $v . "`";
326-
};
326+
};
327327
$colsValue = implode(", ", $cols);
328328
}
329329
else
330330
$colsValue = strval($cols);
331331
$onString = $this->getCondString($on, $all, true);
332332
$condString = $this->getCondString($cond, $all);
333-
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
334-
if(!empty($order))
335-
$order = " ORDER BY `" . $order . "` " . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
333+
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
334+
if(!empty($order))
335+
$order = " ORDER BY `" . $order . "` " . (boolval($flags & self::ORDER_DESC) ? " DESC" : " ASC");
336336
return $this->query("
337337
SELECT $colsValue
338338
FROM `$table`
@@ -597,20 +597,20 @@ private function getCondString($a, $and, $on = false) {
597597
};
598598
if(!is_numeric($v2))
599599
$v3 = $this->escape($v2);
600-
if(is_numeric($k))
601-
$r.= $v;
602-
else {
603-
$r.= "`" . $this->escape($k) . "`";
604-
$r.= " = ";
605-
if(is_numeric($v3))
606-
$v3 = intval($v3);
607-
if($v3===NULL)
608-
$r.= "IS NULL";
609-
elseif(is_numeric($v3))
610-
$r.= $v;
611-
else
612-
$r.= ($on || $col) ? "`$v3`" : "'$v3'";
613-
};
600+
if(is_numeric($k))
601+
$r.= $v;
602+
else {
603+
$r.= "`" . $this->escape($k) . "`";
604+
$r.= " = ";
605+
if(is_numeric($v3))
606+
$v3 = intval($v3);
607+
if($v3===NULL)
608+
$r.= "IS NULL";
609+
elseif(is_numeric($v3))
610+
$r.= $v;
611+
else
612+
$r.= ($on || $col) ? "`$v3`" : "'$v3'";
613+
};
614614
$r.= $and ? " AND " : " OR ";
615615
};
616616
return rtrim($r, $and ? " AND " : " OR ");
@@ -625,18 +625,18 @@ private function getCondString($a, $and, $on = false) {
625625
};
626626
if(!is_numeric($v))
627627
$v = $this->escape($v);
628-
if(is_numeric($k))
629-
$r.= $v;
630-
else {
631-
$r.= "`" . $this->escape($k) . "`";
632-
$r.= " = ";
633-
if(is_numeric($v))
634-
$v = intval($v);
635-
if(is_numeric($v))
636-
$r.= $v;
637-
else
638-
$r.= ($on || $col) ? "`$v`" : "'$v'";
639-
};
628+
if(is_numeric($k))
629+
$r.= $v;
630+
else {
631+
$r.= "`" . $this->escape($k) . "`";
632+
$r.= " = ";
633+
if(is_numeric($v))
634+
$v = intval($v);
635+
if(is_numeric($v))
636+
$r.= $v;
637+
else
638+
$r.= ($on || $col) ? "`$v`" : "'$v'";
639+
};
640640
$r.= $and ? " AND " : " OR ";
641641
};
642642
};
@@ -682,7 +682,7 @@ public function getColumns() {
682682
switch($meta['pdo_type']) {
683683
case PDO::PARAM_BOOL: $columns[bcsub($i, 1)]->type = "BOOL"; break;
684684
case PDO::PARAM_INT: $columns[bcsub($i, 1)]->type = "INT"; break;
685-
case PDO::PARAM_STR: $columns[bcsub($i, 1)]->type = $meta['native_type']=="VAR_STRING" ? "VARCHAR" : "CHAR"; break;
685+
case PDO::PARAM_STR: $columns[bcsub($i, 1)]->type = $meta['native_type']=="VAR_STRING" ? "VARCHAR" : ($meta['native_type']=="LONGLONG" ? "BIGINT" : "CHAR"); break;
686686
default: $columns[bcsub($i, 1)]->type = NULL;
687687
};
688688
if($meta['native_type']=="TINY")

0 commit comments

Comments
 (0)