Skip to content

Commit

Permalink
Update smysql.php
Browse files Browse the repository at this point in the history
  • Loading branch information
@ratajs
ratajs authored Aug 11, 2020
1 parent bc480bf commit 1320275
Showing 1 changed file with 55 additions and 41 deletions.
96 changes: 55 additions & 41 deletions smysql.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,8 @@ public function result() {
return $this->result;
}

public function charset($charset) {
$this->connect->exec("SET NAMES " . $charset);
return $charset;
public function charset($charset, $flags = 0) {
return $this->query("SET NAMES " . $charset, $flags, "charset");
}

public function fetch($flags = 512) {
Expand All @@ -221,8 +220,6 @@ public function fetch($flags = 512) {
}

public function deleteDB($db, $flags) {
if($db==$this->db)
throw new SmysqlException("(deleteDB): You can’t delete current database");
if($this->query("DROP DATABASE `$db`", $flags, "deleteDB")) {
return true;
}
Expand All @@ -240,14 +237,18 @@ public function changeDB($newDB) {
$this->reload();
}

public function select($table, $order = "", $cols = ["*"], $limit = NULL, $flags = 129) {
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
elseif($v!="*")
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
public function select($table, $order = "", $cols = "*", $limit = NULL, $flags = 129) {
if(is_array($cols)) {
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
else
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
}
else
$colsValue = strval($cols);
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
if(!empty($order))
$order = " ORDER BY `" . $order . "`" . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
Expand All @@ -256,16 +257,20 @@ public function select($table, $order = "", $cols = ["*"], $limit = NULL, $flags
", $flags, "select");
}

public function selectWhere($table, $cond, $order = "", $cols = ["*"], $limit = NULL, $flags = 129, $name = "selectWhere") {
public function selectWhere($table, $cond, $order = "", $cols = "*", $limit = NULL, $flags = 129, $name = "selectWhere") {
$all = !boolval($cond & self::COND_OR);
if(is_array($cols)) {
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
else
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
}
else
$colsValue = strval($cols);
$condString = $this->getCondString($cond, $all);
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
elseif($v!="*")
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
if(!empty($order))
$order = " ORDER BY `" . $order . "`" . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
Expand All @@ -274,22 +279,27 @@ public function selectWhere($table, $cond, $order = "", $cols = ["*"], $limit =
", $flags, $name);
}

public function selectJoin($table, $join, $on, $order = "", $cols = ["*"], $limit = NULL, $flags = 133) {
public function selectJoin($table, $join, $on, $order = "", $cols = "*", $limit = NULL, $flags = 133) {
$all = !boolval($flags & self::COND_OR);
switch(true) {
case boolval($flags & self::JOIN_LEFT): $jt = "LEFT OUTER"; break;
case boolval($flags & self::JOIN_RIGHT): $jt = "RIGHT OUTER"; break;
case boolval($flags & self::JOIN_FULL): $jt = "FULL OUTER"; break;
default: $jt = "INNER";
};
if(is_array($cols)) {
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
else
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
}
else
$colsValue = strval($cols);
$onString = $this->getCondString($on, $all, true);
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
elseif($v!="*")
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
$condString = $this->getCondString($cond, $all);
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
if(!empty($order))
$order = " ORDER BY `" . $order . "` " . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
Expand All @@ -300,23 +310,27 @@ public function selectJoin($table, $join, $on, $order = "", $cols = ["*"], $limi
", $flags, "selectJoin");
}

public function selectJoinWhere($table, $join, $on, $cond, $order = "", $cols = ["*"], $limit = NULL, $flags = 133) {
public function selectJoinWhere($table, $join, $on, $cond, $order = "", $cols = "*", $limit = NULL, $flags = 133) {
$all = !boolval($flags & self::COND_OR);
switch(true) {
case boolval($flags & self::JOIN_LEFT): $jt = "LEFT OUTER"; break;
case boolval($flags & self::JOIN_RIGHT): $jt = "RIGHT OUTER"; break;
case boolval($flags & self::JOIN_FULL): $jt = "FULL OUTER"; break;
default: $jt = "INNER";
};
if(is_array($cols)) {
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
else
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
}
else
$colsValue = strval($cols);
$onString = $this->getCondString($on, $all, true);
$condString = $this->getCondString($cond, $all);
foreach($cols as $k => $v) {
if(gettype($k)!="integer")
$cols[$k] = "`" . $v . "`" . " AS " . "`" . $k . "`";
elseif($v!="*")
$cols[$k] = "`" . $v . "`";
};
$colsValue = implode(", ", $cols);
$limitString = ($limit===NULL || $limit==="") ? "" : " LIMIT " . intval($this->escape($limit));
if(!empty($order))
$order = " ORDER BY `" . $order . "` " . (boolval($flags & self::ORDER_DESC) ? "DESC" : "ASC");
Expand All @@ -330,7 +344,7 @@ public function selectJoinWhere($table, $join, $on, $cond, $order = "", $cols =

public function exists($table, $cond, $flags = 129, $name = "exists") {
$all = !boolval($flags & self::COND_OR);
$this->selectWhere($table, $cond, "", ["*"], NULL, $flags, $name);
$this->selectWhere($table, $cond, "", "*", NULL, $flags, $name);
$noFetch = !$this->fetch();
return !$noFetch;
}
Expand Down Expand Up @@ -421,15 +435,15 @@ public function change($table, $name, $newname, $type, $length, $null, $data = "

public function selectAll($table, $flags = 129) {
$r = $this->result;
$this->select($table, "", ["*"], NULL, $flags);
$this->select($table, "", "*", NULL, $flags);
$f = $this->fetch($flags | self::FETCH_ALL);
$this->result = $r;
return $f;
}

public function fetchWhere($table, $cond, $flags = 129) {
$r = $this->result;
$this->selectWhere($table, $cond, "", ["*"], NULL, $flags);
$this->selectWhere($table, $cond, "", "*", NULL, $flags);
$f = $this->fetch();
$this->result = $r;
return $f;
Expand All @@ -453,7 +467,7 @@ public function read($table, $cond = [], $flags = 129) {
else
return false;
else {
$this->selectWhere($table, $cond, "", ["*"], NULL, $flags);
$this->selectWhere($table, $cond, "", "*", NULL, $flags);
$f = $this->fetch(self::FETCH_ALL);
};
if($f===new stdClass() && !boolval($flags & self::ALWAYS_ARRAY))
Expand Down

0 comments on commit 1320275

Please sign in to comment.