Commit 9d1a821f authored by Jim Fulton's avatar Jim Fulton

Changed the way quoting was exported.

parent 6670761a
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
__doc__='''Generic Database adapter __doc__='''Generic Database adapter
$Id: DA.py,v 1.41 1998/04/27 16:11:11 jim Exp $''' $Id: DA.py,v 1.42 1998/04/27 18:31:32 jim Exp $'''
__version__='$Revision: 1.41 $'[11:-2] __version__='$Revision: 1.42 $'[11:-2]
import OFS.SimpleItem, Aqueduct.Aqueduct, Aqueduct.RDB import OFS.SimpleItem, Aqueduct.Aqueduct, Aqueduct.RDB
import DocumentTemplate, marshal, md5, base64, DateTime, Acquisition, os import DocumentTemplate, marshal, md5, base64, DateTime, Acquisition, os
...@@ -27,6 +27,7 @@ from time import time ...@@ -27,6 +27,7 @@ from time import time
from zlib import compress, decompress from zlib import compress, decompress
md5new=md5.new md5new=md5.new
import ExtensionClass import ExtensionClass
import DocumentTemplate.DT_Util
class SQL(DocumentTemplate.HTML): class SQL(DocumentTemplate.HTML):
commands={} commands={}
...@@ -264,7 +265,7 @@ class DA( ...@@ -264,7 +265,7 @@ class DA(
argdata=self._argdata(REQUEST) argdata=self._argdata(REQUEST)
argdata['sql_delimiter']='\0' argdata['sql_delimiter']='\0'
argdata['sql_adapter__']=DB__ argdata['sql_quote']=DB__.sql_quote__
query=apply(self.template, (p,), argdata) query=apply(self.template, (p,), argdata)
if src__: return query if src__: return query
...@@ -300,9 +301,9 @@ class DA( ...@@ -300,9 +301,9 @@ class DA(
else: p=None else: p=None
argdata['sql_delimiter']='\0' argdata['sql_delimiter']='\0'
argdata['sql_adapter__']=DB__ argdata['sql_quote']=DB__.sql_quote__
query=apply(self.template,(p,),argdata) query=apply(self.template,(p,),argdata)
if self.cache_time_: if self.cache_time_:
result=self._cached_result(DB__, query, 1) result=self._cached_result(DB__, query, 1)
else: else:
...@@ -427,6 +428,9 @@ def getBrain(self, ...@@ -427,6 +428,9 @@ def getBrain(self,
############################################################################## ##############################################################################
# #
# $Log: DA.py,v $ # $Log: DA.py,v $
# Revision 1.42 1998/04/27 18:31:32 jim
# Changed the way quoting was exported.
#
# Revision 1.41 1998/04/27 16:11:11 jim # Revision 1.41 1998/04/27 16:11:11 jim
# Stuff DA into template dict so that sqlvar and sqltest can use it. # Stuff DA into template dict so that sqlvar and sqltest can use it.
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment