X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=db.php;h=51452b871493c602ae8a4a00645ab995b5739df1;hb=317dd86de6d8576196cf865109d621219fa2f187;hp=952cc231a1d01ef6878a182fad802c0961e277c6;hpb=22d5fb7ab7d4ee86bd59e194387dca268bd577a1;p=wfpl.git

diff --git a/db.php b/db.php
index 952cc23..51452b8 100644
--- a/db.php
+++ b/db.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2006 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 require_once('code/wfpl/encode.php');
@@ -101,17 +98,16 @@ function db_send_query($sql) {
 # %"  output double quotes, surrounding the variable which is encoded to be in there.
 # %s  output encoded to be in double quotes, but don't output the quotes
 #
-# complex example: db_get_rows('mytable', 'id', 'name=%" or company like "%%%s%%"', $name, $company_partial);
+# complex example: db_get_rows('mytable', 'id', 'where name=%" or company like "%%%s%%"', $name, $company_partial);
 
 function db_printf($str) {
 	$args = func_get_args();
 	$args = array_slice($args, 1);
-	_db_printf($str, $args);
+	return _db_printf($str, $args);
 }
 
 # This function does the work, but takes the parameters in an array
 function _db_printf($str, $args) {
-	$args = array_reverse($args); # because array_pop() takes from the end
 	$out = '';
 	while($str) {
 		$pos = strpos($str, '%');
@@ -129,9 +125,11 @@ function _db_printf($str, $args) {
 		$str = substr($str, $pos + 2);
 
 		if($chr == '"') {
-			$out .= '"' . enc_sql(array_pop($args)) . '"';
+			$out .= '"' . enc_sql(array_shift($args)) . '"';
+		} elseif($chr == 's') {
+			$out .= enc_sql(array_shift($args));
 		} elseif($chr == 'i') {
-			$int = format_int(array_pop($args));
+			$int = format_int(array_shift($args));
 			if($int == '') $int = '0';
 			$out .= $int;
 		} else {
@@ -146,7 +144,7 @@ function _db_printf($str, $args) {
 function db_send_get($table, $columns, $where, $args) {
 	$sql = "SELECT $columns FROM $table";
 	if($where) {
-		$sql .= ' WHERE ' . _db_printf($where, $args);
+		$sql .= ' ' . _db_printf($where, $args);
 	}
 
 	return db_send_query($sql);
@@ -168,6 +166,22 @@ function db_get_rows($table, $columns, $where = '') {
 	return $rows;
 }
 
+# like db_get_rows, but return array of hashes.
+function db_get_assocs($table, $columns, $where = '') {
+	$args = func_get_args();
+	$args = array_slice($args, 3);
+	$result = db_send_get($table, $columns, $where, $args);
+
+	$rows = array();
+	while($row = mysql_fetch_assoc($result)) {
+		$rows[] = $row;
+	}
+
+	mysql_free_result($result);
+
+	return $rows;
+}
+
 function db_get_column($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -195,6 +209,19 @@ function db_get_row($table, $columns, $where = '') {
 	return $row;
 }
 
+# like db_get_row, but return a hash.
+function db_get_assoc($table, $columns, $where = '') {
+	$args = func_get_args();
+	$args = array_slice($args, 3);
+	$result = db_send_get($table, $columns, $where, $args);
+
+	$row = mysql_fetch_assoc($result);
+
+	mysql_free_result($result);
+
+	return $row;
+}
+
 function db_get_value($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -210,6 +237,12 @@ function db_get_value($table, $columns, $where = '') {
 	return $value;
 }
 
+function db_count($table, $where = '') {
+	$args = func_get_args();
+	array_splice($args, 1, 0, array('count(*)'));
+	return call_user_func_array('db_get_value', $args);
+}
+
 # call either of these ways:
 #
 # db_insert('people', 'name,company', 'jason', 'widgets ltd');
@@ -253,10 +286,10 @@ function db_insert_ish($command, $table, $columns, $values) {
 	db_send_query($sql);
 }
 
-# to be consistant with the syntax of the other db functions, $values can be an
+# to be consistent with the syntax of the other db functions, $values can be an
 # array, a single value, or multiple parameters.
 #
-# as usual the where clause stuff is optional, but it will ofcourse update the
+# as usual the where clause stuff is optional, but it will of course update the
 # whole table if you leave it off.
 #
 # examples:
@@ -265,17 +298,17 @@ function db_insert_ish($command, $table, $columns, $values) {
 # db_update('users', 'name', 'Bruce');
 #
 # # name user #6 Bruce
-# db_update('users', 'name', 'Bruce', 'id= %"', 6);
+# db_update('users', 'name', 'Bruce', 'where id=%i', 6);
 #
 # # update the whole bit for user #6
-# db_update('users', 'name,email,description', 'Bruce', 'bruce@example.com', 'is a cool guy', 'id= %"', 6);
+# db_update('users', 'name,email,description', 'Bruce', 'bruce@example.com', 'is a cool guy', 'where id=%i', 6);
 #
 # # update the whole bit for user #6 (passing data as an array)
 # $data = array('Bruce', 'bruce@example.com', 'is a cool guy');
-# db_update('users', 'name,email,description', $data, 'id= %"', 6);
+# db_update('users', 'name,email,description', $data, 'where id=%i', 6);
 
 # The prototype is really something like this:
-# db_update(table, columns, values..., where(optional), where_args...(optional
+# db_update(table, columns, values..., where(optional), where_args...(optional))
 function db_update($table, $columns, $values) {
 	$args = func_get_args();
 	$args = array_slice($args, 2);
@@ -283,6 +316,7 @@ function db_update($table, $columns, $values) {
 	$num_fields = count($columns);
 
 	if(is_array($values)) {
+		$values = array_values($values);
 		$args = array_slice($args, 1);
 	} else {
 		$values = array_slice($args, 0, $num_fields);
@@ -305,8 +339,8 @@ function db_update($table, $columns, $values) {
 		$where = $args[0];
 		$args = array_slice($args, 1);
 
-		$sql .= ' WHERE ';
-		# any left for where claus arguments?
+		$sql .= ' ';
+		# any left for printf arguments?
 		if($args) {
 			$sql .= _db_printf($where, $args);
 		} else {
@@ -322,7 +356,7 @@ function db_update($table, $columns, $values) {
 function db_delete($table, $where = '') {
 	$sql = "DELETE FROM $table";
 	if($where) {
-		$sql .= ' WHERE ';
+		$sql .= ' ';
 		$args = func_get_args();
 		$args = array_slice($args, 2);
 		if($args) {