From ffa87bfd59739be384d4bc29defa4f5de5e41dc3 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Tue, 14 May 2019 11:20:28 +0800
Subject: [PATCH] change

---
 sqlor/.dbpools.py.swp | Bin 16384 -> 16384 bytes
 sqlor/dbpools.py      |  50 +++++++++++++++++++++++++-----------------
 sqlor/sor.py          |  10 +++++++--
 test/test.py          |  14 ++++++++++--
 4 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/sqlor/.dbpools.py.swp b/sqlor/.dbpools.py.swp
index 41808d26dce7576babc492625d1dead93fe799d9..c24df8026d27718ca837f499cadc82f5aabb33d0 100644
GIT binary patch
delta 591
zcmYk&Ur1AN6u|Lwb4xd9Gx}!+dAVU&8@3qD-MdB+CiIY&f<=jT^<Gif8s5865$3R7
zMo5ew;e$o=6cItOhoq>NsCVh1=p}p!6`vyTvA#1OI`HB5<8aRJ{5a*ZRxWF8qlv+D
z=k;`FLWpLOx#ahu2m9CL_c4)M`KjvD_SfC(QLR!t-u$I)$4!bBxBaWEsGW&FGkREL
zBP8+(FYpi*Ok)HWki|(HL=-DcA|LS%3n-umCfczZ5v(+de8UGk$759C;~GX9WkxJ6
zF$C~qyU16(!5r?uK`+iAg%$)6z;aMz2`^E_EUw}Tj-nN-0g=yG#68?aA5I}0U`sz6
z7>Xx&gb7^6A!zu;zTTp~xA$tw*i(Hqu9lOnwY|v`4XV$)q-E7J^RS9#S`PRHuhVn=
zQm)uD>E;~2!*Ttwc<;aw38{-+h8oSBRuMC{tN;HR-_4E3b#>OX>+gh1-gVuvi#9Dy
z>5f!rT0-?OyuuCNusnCn-%1n<MLTC$n@4;zS8vm^`fXb6bWGh($JIcWzBP4Fl~PgV
WnDgZJsk{|Y!<lY=6Rzbg75ocMA$>*w

delta 985
zcmaLU&rcIU6bJBEpvV$`pa}_}rjsU3e^6?{SW2}Q@E3`Y7=i~8Whe`7Y<KDGHcdlt
z8$IcTm`OaL!~-`x82kskfF2dS7-NijFv>;afdf&$yRDHX#La%P`)1zGym?zLd&*^x
zZ!&&qaEK*ial+L?)EaqvWug5m{X9lg%H{7p3OqTzdB9_@cDHQ!_I*auc3maYmIvd%
zZE7akQi#@I1@6OLxCs+51Q#F%KG<p^+JL8U2RMvEKlDHsG{Lt$MDO4QJck9Cg^Lh^
z2KdrQHa%-3DnlLy;XDMO6~23k-oP3x!9&pDDs(|JY&T#7SO*EWVHhHC7(Ue#eSj5M
zgc&#k3HViKSNf4g&;dWto7b=o%Ww-W!zpksg%m}oRzc{D;faVBxn?m_%}&Rz{eM=d
zS(TgWfT8cmvv*m>P27>ggi;e#_pKSL33e^a$*A1b1GtsT$H$vjU-g`*57eCGU#)s*
zYEtJpHJUMWJuK%F9rhTT3pzu=lr|P0j|Q#Mtoz<QKF_8N!8E4nEK?A%Db>sfZPwBZ
zosDB}w|D7k#|#lO^Vva572GmJ$jOZkkA&Sc)0tGQfr7wW$k{oH_1rmbDkVL`ikfwu
z$p@jfpyEukG~4+jc)p+sr_+C{50hL>`n_0<rRB?HTO&7}RpiOuqlc>J8y<;9A~%X$
z%$U-X=-6BB(iFEi$%#HDH+uu!^KN;5VH8b&N~jsL5?hAFv;LI(h&n^gSEy-@<hf+0
qG+`;}lOGcq8Sd+pM-u&Vxo^~KiBifbtX<|(`{nz@+0|T1djA0aRr|I8

diff --git a/sqlor/dbpools.py b/sqlor/dbpools.py
index 6ee08c0..1094e83 100644
--- a/sqlor/dbpools.py
+++ b/sqlor/dbpools.py
@@ -210,42 +210,52 @@ class DBPools:
 		@wraps(func)
 		async def wrap_func(dbname,NS,callback,**kw):
 			sor = await self.getSqlor(dbname)
-			desc = func(dbname,NS,callback,**kw)
 			try:
+				desc = func(dbname,NS,callback,**kw)
 				ret = await sor.runSQL(desc,NS,callback,**kw)
 			except Exception as e:
 				print('error:',e)
 				raise e
 			finally:
 				await self.freeSqlor(sor)
+				return ret
 		return wrap_func
 
 	def runSQLPaging(self,func):
 		@wraps(func)
 		async def wrap_func(dbname,NS,**kw):
 			sor = await self.getSqlor(dbname)
-			desc = func(dbname,NS,**kw)
-			total = await sor.record_count(desc,NS)
-			recs = await sor.pagingdata(desc,NS)
-			data = {
-				"total":total,
-				"rows":recs
-			}
-			print(len(recs),'records return')
-			await self.freeSqlor(sor)
-			return data
+			try:
+				desc = func(dbname,NS,**kw)
+				total = await sor.record_count(desc,NS)
+				recs = await sor.pagingdata(desc,NS)
+				data = {
+					"total":total,
+					"rows":recs
+				}
+				print(len(recs),'records return')
+				return data
+			except Exception as e:
+				print('error',e)
+				raise e
+			finally:
+				await self.freeSqlor(sor)
 		return wrap_func
 
-	async def runSQLResultFields(self, dbname,NS,**kwargs):
-			sor = self.getSqlor(dbname)
-			desc = func(dbname,NS,**kw)
-			conn = await self._aquireConn(dbname)
-			async with conn.cursor() as cur:
-				sor.setCursor(conn,cur)
-				ret=await sor.sqlIterator(desc,NS)
-				ret = [ {'name':i[0],'type':i[1]} for i in cur.description ]
+	def runSQLResultFields(self, func):
+		@wraps(func)
+		async def wrap_func(dbname,NS,**kw):
+			sor = await self.getSqlor(dbname)
+			try:
+				desc = func(dbname,NS,**kw)
+				ret = await sor.resultFields(desc,NS)
 				return ret
-			await self._releaseConn(dbname,conn)
+			except Exception as e:
+				print('error=',e)
+				raise e
+			finally:
+				await self.freeSqlor(sor)
+		return wrap_func
 
 	async def getTables(self,dbname):
 		@self.inSqlor
diff --git a/sqlor/sor.py b/sqlor/sor.py
index b3a18b4..340fe4c 100644
--- a/sqlor/sor.py
+++ b/sqlor/sor.py
@@ -309,7 +309,7 @@ class SQLor(object):
 				self.recs.append(rec)
 
 		c = Cnt()
-		await self.sqlIterator(cnt_desc,NS,c.handler)
+		await self.runSQL(cnt_desc,NS,c.handler)
 		print(c.recs[0])
 		t = c.recs[0]['rcnt']
 		return t
@@ -341,8 +341,14 @@ class SQLor(object):
 				self.recs.append(rec)
 
 		c = Cnt()
-		await self.sqlIterator(paging_desc,NS,c.handler)
+		await self.runSQL(paging_desc,NS,c.handler)
 		return c.recs
+
+	async def resultFields(self,desc,NS):
+		NS.update(rows=1,page=1)
+		r = await self.pagingdata(desc,NS)
+		ret = [ {'name':i[0],'type':i[1]} for i in self.cur.description ]
+		return ret
 		
 	async def runSQL(self,desc,NS,callback,**kw):
 		class RecordHandler:
diff --git a/test/test.py b/test/test.py
index 9a45d0a..2a093de 100644
--- a/test/test.py
+++ b/test/test.py
@@ -31,7 +31,7 @@ dbs={
 loop = asyncio.get_event_loop()
 pool = DBPools(dbs,loop=loop)
 
-async def testfunc():
+async def testfunc1():
 	@pool.runSQL
 	def sql(db,ns,callback):
 		return {
@@ -39,4 +39,14 @@ async def testfunc():
 	}
 	x  = await sql('cfae',{},print)
 
-loop.run_until_complete(testfunc())
+async def testfunc2():
+	@pool.runSQLResultFields
+	def sql(db,NS):
+		return {
+		"sql_string":"select * from product",
+	}
+	x  = await sql('cfae',{})
+	print(x)
+
+loop.run_until_complete(testfunc1())
+loop.run_until_complete(testfunc2())