From ce2814021b9e865716e480aab1e66f3c2879e8b6 Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@gmail.com>
Date: Fri, 7 Jul 2023 18:32:55 +0800
Subject: [PATCH] =?UTF-8?q?tools=5Fsql=E4=BF=AE=E6=AD=A3select=5Ftable=5Ft?=
 =?UTF-8?q?o=5Farray=E6=B2=A1=E6=9C=89order=E5=8F=82=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools_json.php    |  3 +--
 tools_session.php |  2 +-
 tools_sql.php     | 22 ++++++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tools_json.php b/tools_json.php
index e51d701..4e3a7bd 100644
--- a/tools_json.php
+++ b/tools_json.php
@@ -22,5 +22,4 @@
 
         exit;
     }
-
-
+?>
diff --git a/tools_session.php b/tools_session.php
index d559e08..2bc69fb 100644
--- a/tools_session.php
+++ b/tools_session.php
@@ -23,4 +23,4 @@
 	{		
 		session_destroy();
 	}
-?>
\ No newline at end of file
+?>
diff --git a/tools_sql.php b/tools_sql.php
index 564b4dd..22605fe 100644
--- a/tools_sql.php
+++ b/tools_sql.php
@@ -48,7 +48,7 @@
 //             $this->table_name=$tn;
 //         }
 //
-//         public function get_field_list()
+//         public function sql_get_field_list()
 //         {
 //             if($field_array)
 //                 return $field_array;
@@ -84,7 +84,7 @@
 //         }
 //     };//class SQLConnect
 
-    function get_field_list($sql,$table_name)
+    function sql_get_field_list($sql,$table_name)
     {
     	if($sql==null)return null;
 
@@ -100,7 +100,7 @@
     	return $field_array;
     }
 
-    function select_table()//$sql,$table_name,$field_array,$where,$order,$start,$count)
+    function sql_select_table()//$sql,$table_name,$field_array,$where,$order,$start,$count)
     {
         $sql        =func_get_arg(0);
         $table_name =func_get_arg(1);
@@ -156,17 +156,19 @@
         return null;
     }
 
-    function select_table_to_array()//$sql,$table_name,$field_array,$where,$start,$count)
+    function sql_select_table_to_array()//$sql,$table_name,$field_array,$where,$order,$start,$count)
     {
         $sql        =func_get_arg(0);
         $table_name =func_get_arg(1);
-        $field_array =func_get_arg(2);
+        $field_array=func_get_arg(2);
 
-        if(func_num_args()>3)$where=func_get_arg(3);
-        if(func_num_args()>4)
+        if(func_num_args()>3)$where=func_get_arg(3);else $where=null;
+        if(func_num_args()>4)$order=func_get_arg(4);else $order=null;
+
+        if(func_num_args()>5)
         {
-            $start=func_get_arg(4);
-            $count=func_get_arg(5);
+            $start=func_get_arg(5);
+            $count=func_get_arg(6);
         }
         else
         {
@@ -174,7 +176,7 @@
             $count=0;
         }
 
-        $sql_result=select_table($sql,$table_name,$field_array,$where,$start,$count);
+        $sql_result=sql_select_table($sql,$table_name,$field_array,$where,$order,$start,$count);
 
         if(!$sql_result)return(null);