Skip to content

erp5
erp5
Commit 19479af1 authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Update ZMySQLDDA string. 

Replace some Tabs with Spaces.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7701 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 197db67b
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 163 deletions
product/ZMySQLDDA/CHANGES.txt
View file @ 19479af1
Z MySQL DDA Releases Z MySQL Deferred DA Releases
2.0.9 2.0.9
......
product/ZMySQLDDA/DA.py
View file @ 19479af1
############################################################################## ##############################################################################
# #
# Zope Public License (ZPL) Version 1.0 # Zope Public License (ZPL) Version 1.0
# ------------------------------------- # -------------------------------------
# #
# Copyright (c) Digital Creations. All rights reserved. # Copyright (c) Digital Creations. All rights reserved.
# Copyright (c) Nexedi SARL 2004. All rights reserved. # Copyright (c) Nexedi SARL 2004. All rights reserved.
# #
# This license has been certified as Open Source(tm). # This license has been certified as Open Source(tm).
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
# met: # met:
# #
# 1. Redistributions in source code must retain the above copyright # 1. Redistributions in source code must retain the above copyright
# notice, this list of conditions, and the following disclaimer. # notice, this list of conditions, and the following disclaimer.
# #
# 2. Redistributions in binary form must reproduce the above copyright # 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions, and the following disclaimer in # notice, this list of conditions, and the following disclaimer in
# the documentation and/or other materials provided with the # the documentation and/or other materials provided with the
# distribution. # distribution.
# #
# 3. Digital Creations requests that attribution be given to Zope # 3. Digital Creations requests that attribution be given to Zope
# in any manner possible. Zope includes a "Powered by Zope" # in any manner possible. Zope includes a "Powered by Zope"
# button that is installed by default. While it is not a license # button that is installed by default. While it is not a license
...@@ -27,43 +27,43 @@ ...@@ -27,43 +27,43 @@
# attribution remain. A significant investment has been put # attribution remain. A significant investment has been put
# into Zope, and this effort will continue if the Zope community # into Zope, and this effort will continue if the Zope community
# continues to grow. This is one way to assure that growth. # continues to grow. This is one way to assure that growth.
# #
# 4. All advertising materials and documentation mentioning # 4. All advertising materials and documentation mentioning
# features derived from or use of this software must display # features derived from or use of this software must display
# the following acknowledgement: # the following acknowledgement:
# #
# "This product includes software developed by Digital Creations # "This product includes software developed by Digital Creations
# for use in the Z Object Publishing Environment # for use in the Z Object Publishing Environment
# (http://www.zope.org/)." # (http://www.zope.org/)."
# #
# In the event that the product being advertised includes an # In the event that the product being advertised includes an
# intact Zope distribution (with copyright and license included) # intact Zope distribution (with copyright and license included)
# then this clause is waived. # then this clause is waived.
# #
# 5. Names associated with Zope or Digital Creations must not be used to # 5. Names associated with Zope or Digital Creations must not be used to
# endorse or promote products derived from this software without # endorse or promote products derived from this software without
# prior written permission from Digital Creations. # prior written permission from Digital Creations.
# #
# 6. Modified redistributions of any form whatsoever must retain # 6. Modified redistributions of any form whatsoever must retain
# the following acknowledgment: # the following acknowledgment:
# #
# "This product includes software developed by Digital Creations # "This product includes software developed by Digital Creations
# for use in the Z Object Publishing Environment # for use in the Z Object Publishing Environment
# (http://www.zope.org/)." # (http://www.zope.org/)."
# #
# Intact (re-)distributions of any official Zope release do not # Intact (re-)distributions of any official Zope release do not
# require an external acknowledgement. # require an external acknowledgement.
# #
# 7. Modifications are encouraged but must be packaged separately as # 7. Modifications are encouraged but must be packaged separately as
# patches to official Zope releases. Distributions that do not # patches to official Zope releases. Distributions that do not
# clearly separate the patches from the original work must be clearly # clearly separate the patches from the original work must be clearly
# labeled as unofficial distributions. Modifications which do not # labeled as unofficial distributions. Modifications which do not
# carry the name Zope may be packaged in any form, as long as they # carry the name Zope may be packaged in any form, as long as they
# conform to all of the clauses above. # conform to all of the clauses above.
# #
# #
# Disclaimer # Disclaimer
# #
# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY # THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
...@@ -76,12 +76,12 @@ ...@@ -76,12 +76,12 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# #
# This software consists of contributions made by Digital Creations and # This software consists of contributions made by Digital Creations and
# many individuals on behalf of Digital Creations. Specific # many individuals on behalf of Digital Creations. Specific
# attributions are listed in the accompanying credits file. # attributions are listed in the accompanying credits file.
# #
############################################################################## ##############################################################################
from Products.ZMySQLDA.DA import * from Products.ZMySQLDA.DA import *
...@@ -101,10 +101,10 @@ class DeferredConnection(Connection): ...@@ -101,10 +101,10 @@ class DeferredConnection(Connection):
Experimental MySQL DA which implements Experimental MySQL DA which implements
deferred SQL code execution to reduce locking issues deferred SQL code execution to reduce locking issues
""" """
meta_type=title='Z %s Database Deferred Connection' % database_type meta_type=title='Z %s Deferred Database Connection' % database_type
def factory(self): return DeferredDB def factory(self): return DeferredDB
def connect(self,s): def connect(self,s):
try: self._v_database_connection.close() try: self._v_database_connection.close()
except: pass except: pass
...@@ -114,11 +114,11 @@ class DeferredConnection(Connection): ...@@ -114,11 +114,11 @@ class DeferredConnection(Connection):
self._v_database_connection=DeferredDB(s) self._v_database_connection=DeferredDB(s)
self._v_connected=DateTime() self._v_connected=DateTime()
return self return self
classes=('DA.DeferredConnection') classes=('DA.DeferredConnection')
meta_types=( meta_types=(
{'name':'Z %s Database Deferred Connection' % database_type, {'name':'Z %s Deferred Database Connection' % database_type,
'action':'manage_addZ%sDeferredConnectionForm' % database_type, 'action':'manage_addZ%sDeferredConnectionForm' % database_type,
}, },
) )
......
product/ZMySQLDDA/README.txt
View file @ 19479af1
Z MySQL Deferred DA Z MySQL Deferred DA
This is the Z MySQL database deferred adapter product for the This is the Z MySQL database deferred adapter product for the
Z Object Publishing Environment. It is based on Z Object Publishing Environment. It is based on
ZMySQLDA and follows the same API and installation ZMySQLDA and follows the same API and installation
procedure. procedure.
The main difference with ZMySQLDA is that the execution The main difference with ZMySQLDA is that the execution
of SQL expressions is deferred and executed during the Zope of SQL expressions is deferred and executed during the Zope
commit time rather than immediately. This allows for example commit time rather than immediately. This allows for example
...@@ -12,7 +12,7 @@ Z MySQL Deferred DA ...@@ -12,7 +12,7 @@ Z MySQL Deferred DA
time, which reduces risks of lock. It also allows to use time, which reduces risks of lock. It also allows to use
MyISAM tables without raising useless exception messages related MyISAM tables without raising useless exception messages related
to the non transactional nature of MyISAM. to the non transactional nature of MyISAM.
** IMPORTANT ** ** IMPORTANT **
SELECT expressions will not work in deferred mode SELECT expressions will not work in deferred mode
\ No newline at end of file
product/ZMySQLDDA/__init__.py
View file @ 19479af1
############################################################################## ##############################################################################
# #
# Zope Public License (ZPL) Version 1.0 # Zope Public License (ZPL) Version 1.0
# ------------------------------------- # -------------------------------------
# #
# Copyright (c) Digital Creations. All rights reserved. # Copyright (c) Digital Creations. All rights reserved.
# #
# This license has been certified as Open Source(tm). # This license has been certified as Open Source(tm).
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
# met: # met:
# #
# 1. Redistributions in source code must retain the above copyright # 1. Redistributions in source code must retain the above copyright
# notice, this list of conditions, and the following disclaimer. # notice, this list of conditions, and the following disclaimer.
# #
# 2. Redistributions in binary form must reproduce the above copyright # 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions, and the following disclaimer in # notice, this list of conditions, and the following disclaimer in
# the documentation and/or other materials provided with the # the documentation and/or other materials provided with the
# distribution. # distribution.
# #
# 3. Digital Creations requests that attribution be given to Zope # 3. Digital Creations requests that attribution be given to Zope
# in any manner possible. Zope includes a "Powered by Zope" # in any manner possible. Zope includes a "Powered by Zope"
# button that is installed by default. While it is not a license # button that is installed by default. While it is not a license
...@@ -26,43 +26,43 @@ ...@@ -26,43 +26,43 @@
# attribution remain. A significant investment has been put # attribution remain. A significant investment has been put
# into Zope, and this effort will continue if the Zope community # into Zope, and this effort will continue if the Zope community
# continues to grow. This is one way to assure that growth. # continues to grow. This is one way to assure that growth.
# #
# 4. All advertising materials and documentation mentioning # 4. All advertising materials and documentation mentioning
# features derived from or use of this software must display # features derived from or use of this software must display
# the following acknowledgement: # the following acknowledgement:
# #
# "This product includes software developed by Digital Creations # "This product includes software developed by Digital Creations
# for use in the Z Object Publishing Environment # for use in the Z Object Publishing Environment
# (http://www.zope.org/)." # (http://www.zope.org/)."
# #
# In the event that the product being advertised includes an # In the event that the product being advertised includes an
# intact Zope distribution (with copyright and license included) # intact Zope distribution (with copyright and license included)
# then this clause is waived. # then this clause is waived.
# #
# 5. Names associated with Zope or Digital Creations must not be used to # 5. Names associated with Zope or Digital Creations must not be used to
# endorse or promote products derived from this software without # endorse or promote products derived from this software without
# prior written permission from Digital Creations. # prior written permission from Digital Creations.
# #
# 6. Modified redistributions of any form whatsoever must retain # 6. Modified redistributions of any form whatsoever must retain
# the following acknowledgment: # the following acknowledgment:
# #
# "This product includes software developed by Digital Creations # "This product includes software developed by Digital Creations
# for use in the Z Object Publishing Environment # for use in the Z Object Publishing Environment
# (http://www.zope.org/)." # (http://www.zope.org/)."
# #
# Intact (re-)distributions of any official Zope release do not # Intact (re-)distributions of any official Zope release do not
# require an external acknowledgement. # require an external acknowledgement.
# #
# 7. Modifications are encouraged but must be packaged separately as # 7. Modifications are encouraged but must be packaged separately as
# patches to official Zope releases. Distributions that do not # patches to official Zope releases. Distributions that do not
# clearly separate the patches from the original work must be clearly # clearly separate the patches from the original work must be clearly
# labeled as unofficial distributions. Modifications which do not # labeled as unofficial distributions. Modifications which do not
# carry the name Zope may be packaged in any form, as long as they # carry the name Zope may be packaged in any form, as long as they
# conform to all of the clauses above. # conform to all of the clauses above.
# #
# #
# Disclaimer # Disclaimer
# #
# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY # THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# #
# This software consists of contributions made by Digital Creations and # This software consists of contributions made by Digital Creations and
# many individuals on behalf of Digital Creations. Specific # many individuals on behalf of Digital Creations. Specific
# attributions are listed in the accompanying credits file. # attributions are listed in the accompanying credits file.
# #
############################################################################## ##############################################################################
__doc__='''Generic Deferred Database Adapter Package Registration __doc__='''Generic Deferred Database Adapter Package Registration
...@@ -97,11 +97,11 @@ def initialize(context): ...@@ -97,11 +97,11 @@ def initialize(context):
context.registerClass( context.registerClass(
DA.DeferredConnection, DA.DeferredConnection,
permission='Add Z MySQL Database Deferred Connections', permission='Add Z MySQL Deferred Database Connections',
constructors=(DA.manage_addZMySQLDeferredConnectionForm, constructors=(DA.manage_addZMySQLDeferredConnectionForm,
DA.manage_addZMySQLDeferredConnection,) DA.manage_addZMySQLDeferredConnection,)
) )
context.registerHelp() context.registerHelp()
context.registerHelpTitle('ZMySQLDDA') context.registerHelpTitle('ZMySQLDDA')
product/ZMySQLDDA/connectionAdd.dtml
View file @ 19479af1
<html> <html>
<head><title>Add Z MySQL Database Connection</title></head> <head><title>Add Z MySQL Deferred Database Connection</title></head>
<body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B"> <body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B">
<h2>Add Z MySQL Database Deferred Connection</h2> <h2>Add Z MySQL Database Deferred Connection</h2>
<form action="manage_addZMySQLConnection" method="POST"> <form action="manage_addZMySQLConnection" method="POST">
<table cellspacing="2"> <table cellspacing="2">
<tr> <tr>
<th align="LEFT" valign="TOP">Id</th> <th align="LEFT" valign="TOP">Id</th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="id" size="40" <input type="TEXT" name="id" size="40"
value="MySQL_database_connection"> value="MySQL_database_connection">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP"><em>Title</em></th> <th align="LEFT" valign="TOP"><em>Title</em></th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="title" size="40" <input type="TEXT" name="title" size="40"
value="Z MySQL Database Connection"> value="Z MySQL Database Connection">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP"> <th align="LEFT" valign="TOP">
Enter a Database Connection String Enter a Database Connection String
<a href="#1"><sup>1</sup></a></th> <a href="#1"><sup>1</sup></a></th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="connection_string" size="40"> <input type="TEXT" name="connection_string" size="40">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP">Connect immediately</th> <th align="LEFT" valign="TOP">Connect immediately</th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input name="check" type="CHECKBOX" value="YES" CHECKED> <input name="check" type="CHECKBOX" value="YES" CHECKED>
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td><br><input type="SUBMIT" value="Add"></td> <td><br><input type="SUBMIT" value="Add"></td>
</tr> </tr>
</table> </table>
</form> </form>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
respect, it's equivalent to transactions turned off. respect, it's equivalent to transactions turned off.
<p> <p>
Transactions are highly recommended. Using a named lock in Transactions are highly recommended. Using a named lock in
conjunctions with transactions is probably pointless. conjunctions with transactions is probably pointless.
</dd></dl> </dd></dl>
</body> </body>
......
product/ZMySQLDDA/connectionEdit.dtml
View file @ 19479af1
...@@ -3,43 +3,43 @@ ...@@ -3,43 +3,43 @@
<head><title>Edit <dtml-var title_or_id></title></head> <head><title>Edit <dtml-var title_or_id></title></head>
<body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B"> <body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B">
<dtml-var manage_tabs> <dtml-var manage_tabs>
<h2>Edit <dtml-var title_or_id></h2> <h2>Edit <dtml-var title_or_id></h2>
<form action="manage_edit" method="POST"> <form action="manage_edit" method="POST">
<table cellspacing="2"> <table cellspacing="2">
<tr> <tr>
<th align="LEFT" valign="TOP">Id</th> <th align="LEFT" valign="TOP">Id</th>
<td align="LEFT" valign="TOP"><dtml-var id></td> <td align="LEFT" valign="TOP"><dtml-var id></td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP"><em>Title</em></th> <th align="LEFT" valign="TOP"><em>Title</em></th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="title" size="40" <input type="TEXT" name="title" size="40"
value="<dtml-var title html_quote>"> value="<dtml-var title html_quote>">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP">Database Connection String</th> <th align="LEFT" valign="TOP">Database Connection String</th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="connection_string" size="40" <input type="TEXT" name="connection_string" size="40"
value="<dtml-var connection_string html_quote>"> value="<dtml-var connection_string html_quote>">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP">Connect immediately</th> <th align="LEFT" valign="TOP">Connect immediately</th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input name="check" type="CHECKBOX" value="YES" CHECKED> <input name="check" type="CHECKBOX" value="YES" CHECKED>
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td><br><input type="SUBMIT" value="Change"></td> <td><br><input type="SUBMIT" value="Change"></td>
</tr> </tr>
</table> </table>
</form> </form>
......
product/ZMySQLDDA/db.py
View file @ 19479af1
############################################################################## ##############################################################################
# #
# Zope Public License (ZPL) Version 1.0 # Zope Public License (ZPL) Version 1.0
# ------------------------------------- # -------------------------------------
# #
# Copyright (c) Digital Creations. All rights reserved. # Copyright (c) Digital Creations. All rights reserved.
# Copyright (c) Nexedi SARL 2004. All rights reserved. # Copyright (c) Nexedi SARL 2004. All rights reserved.
# #
# This license has been certified as Open Source(tm). # This license has been certified as Open Source(tm).
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
# met: # met:
# #
# 1. Redistributions in source code must retain the above copyright # 1. Redistributions in source code must retain the above copyright
# notice, this list of conditions, and the following disclaimer. # notice, this list of conditions, and the following disclaimer.
# #
# 2. Redistributions in binary form must reproduce the above copyright # 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions, and the following disclaimer in # notice, this list of conditions, and the following disclaimer in
# the documentation and/or other materials provided with the # the documentation and/or other materials provided with the
# distribution. # distribution.
# #
# 3. Digital Creations requests that attribution be given to Zope # 3. Digital Creations requests that attribution be given to Zope
# in any manner possible. Zope includes a "Powered by Zope" # in any manner possible. Zope includes a "Powered by Zope"
# button that is installed by default. While it is not a license # button that is installed by default. While it is not a license
...@@ -27,43 +27,43 @@ ...@@ -27,43 +27,43 @@
# attribution remain. A significant investment has been put # attribution remain. A significant investment has been put
# into Zope, and this effort will continue if the Zope community # into Zope, and this effort will continue if the Zope community
# continues to grow. This is one way to assure that growth. # continues to grow. This is one way to assure that growth.
# #
# 4. All advertising materials and documentation mentioning # 4. All advertising materials and documentation mentioning
# features derived from or use of this software must display # features derived from or use of this software must display
# the following acknowledgement: # the following acknowledgement:
# #
# "This product includes software developed by Digital Creations # "This product includes software developed by Digital Creations
# for use in the Z Object Publishing Environment # for use in the Z Object Publishing Environment
# (http://www.zope.org/)." # (http://www.zope.org/)."
# #
# In the event that the product being advertised includes an # In the event that the product being advertised includes an
# intact Zope distribution (with copyright and license included) # intact Zope distribution (with copyright and license included)
# then this clause is waived. # then this clause is waived.
# #
# 5. Names associated with Zope or Digital Creations must not be used to # 5. Names associated with Zope or Digital Creations must not be used to
# endorse or promote products derived from this software without # endorse or promote products derived from this software without
# prior written permission from Digital Creations. # prior written permission from Digital Creations.
# #
# 6. Modified redistributions of any form whatsoever must retain # 6. Modified redistributions of any form whatsoever must retain
# the following acknowledgment: # the following acknowledgment:
# #
# "This product includes software developed by Digital Creations # "This product includes software developed by Digital Creations
# for use in the Z Object Publishing Environment # for use in the Z Object Publishing Environment
# (http://www.zope.org/)." # (http://www.zope.org/)."
# #
# Intact (re-)distributions of any official Zope release do not # Intact (re-)distributions of any official Zope release do not
# require an external acknowledgement. # require an external acknowledgement.
# #
# 7. Modifications are encouraged but must be packaged separately as # 7. Modifications are encouraged but must be packaged separately as
# patches to official Zope releases. Distributions that do not # patches to official Zope releases. Distributions that do not
# clearly separate the patches from the original work must be clearly # clearly separate the patches from the original work must be clearly
# labeled as unofficial distributions. Modifications which do not # labeled as unofficial distributions. Modifications which do not
# carry the name Zope may be packaged in any form, as long as they # carry the name Zope may be packaged in any form, as long as they
# conform to all of the clauses above. # conform to all of the clauses above.
# #
# #
# Disclaimer # Disclaimer
# #
# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY # THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
...@@ -76,12 +76,12 @@ ...@@ -76,12 +76,12 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
# #
# #
# This software consists of contributions made by Digital Creations and # This software consists of contributions made by Digital Creations and
# many individuals on behalf of Digital Creations. Specific # many individuals on behalf of Digital Creations. Specific
# attributions are listed in the accompanying credits file. # attributions are listed in the accompanying credits file.
# #
############################################################################## ##############################################################################
from Products.ZMySQLDA.db import * from Products.ZMySQLDA.db import *
...@@ -92,11 +92,11 @@ class DeferredDB(DB): ...@@ -92,11 +92,11 @@ class DeferredDB(DB):
of SQL code in order to reduce locks and provide better behaviour of SQL code in order to reduce locks and provide better behaviour
with MyISAM non transactional tables with MyISAM non transactional tables
""" """
def __init__(self,connection): def __init__(self,connection):
DB.__init__(self, connection) DB.__init__(self, connection)
self.sql_string_list = [] self.sql_string_list = []
def query(self,query_string, max_rows=1000): def query(self,query_string, max_rows=1000):
self._use_TM and self._register() self._use_TM and self._register()
desc=None desc=None
...@@ -119,7 +119,7 @@ class DeferredDB(DB): ...@@ -119,7 +119,7 @@ class DeferredDB(DB):
from thread import get_ident from thread import get_ident
self._tlock.acquire() self._tlock.acquire()
self._tthread = get_ident() self._tthread = get_ident()
def _finish(self, *ignored): def _finish(self, *ignored):
from thread import get_ident from thread import get_ident
if not self._tlock.locked() or self._tthread != get_ident(): if not self._tlock.locked() or self._tthread != get_ident():
...@@ -139,12 +139,12 @@ class DeferredDB(DB): ...@@ -139,12 +139,12 @@ class DeferredDB(DB):
error=sys.exc_info()) error=sys.exc_info())
self._tlock.release() self._tlock.release()
raise raise
# Execute SQL # Execute SQL
db = self.db db = self.db
for qs in self.sql_string_list: for qs in self.sql_string_list:
try: try:
db.query(qs) db.query(qs)
c=db.store_result() c=db.store_result()
except OperationalError, m: except OperationalError, m:
if m[0] not in hosed_connection: raise if m[0] not in hosed_connection: raise
# Hm. maybe the db is hosed. Let's restart it. # Hm. maybe the db is hosed. Let's restart it.
...@@ -153,9 +153,9 @@ class DeferredDB(DB): ...@@ -153,9 +153,9 @@ class DeferredDB(DB):
db.query(qs) db.query(qs)
c=db.store_result() c=db.store_result()
except OperationalError, m: except OperationalError, m:
raise raise
LOG('ZMySQLDDA', INFO, "Execute %s" % qs) LOG('ZMySQLDDA', INFO, "Execute %s" % qs)
# Finish commit # Finish commit
LOG('ZMySQLDDA', INFO, "FINISH commit") LOG('ZMySQLDDA', INFO, "FINISH commit")
try: try:
try: try:
...@@ -177,4 +177,4 @@ class DeferredDB(DB): ...@@ -177,4 +177,4 @@ class DeferredDB(DB):
if not self._tlock.locked() or self._tthread != get_ident(): if not self._tlock.locked() or self._tthread != get_ident():
LOG('ZMySQLDDA', INFO, "ignoring _abort") LOG('ZMySQLDDA', INFO, "ignoring _abort")
return return
self._tlock.release() self._tlock.release()
\ No newline at end of file \ No newline at end of file
product/ZMySQLDDA/deferredConnectionAdd.dtml
View file @ 19479af1
<html> <html>
<head><title>Add Z MySQL Database Connection</title></head> <head><title>Add Z MySQL Deferred Database Connection</title></head>
<body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B"> <body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B">
<h2>Add Z MySQL Database Connection</h2> <h2>Add Z MySQL Deferred Database Connection</h2>
<form action="manage_addZMySQLDeferredConnection" method="POST"> <form action="manage_addZMySQLDeferredConnection" method="POST">
<table cellspacing="2"> <table cellspacing="2">
<tr> <tr>
<th align="LEFT" valign="TOP">Id</th> <th align="LEFT" valign="TOP">Id</th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="id" size="40" <input type="TEXT" name="id" size="40"
value="MySQL_database_connection"> value="MySQL_database_connection">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP"><em>Title</em></th> <th align="LEFT" valign="TOP"><em>Title</em></th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="title" size="40" <input type="TEXT" name="title" size="40"
value="Z MySQL Database Connection"> value="Z MySQL Database Connection">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP"> <th align="LEFT" valign="TOP">
Enter a Database Connection String Enter a Database Connection String
<a href="#1"><sup>1</sup></a></th> <a href="#1"><sup>1</sup></a></th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input type="TEXT" name="connection_string" size="40"> <input type="TEXT" name="connection_string" size="40">
</td> </td>
</tr> </tr>
<tr> <tr>
<th align="LEFT" valign="TOP">Connect immediately</th> <th align="LEFT" valign="TOP">Connect immediately</th>
<td align="LEFT" valign="TOP"> <td align="LEFT" valign="TOP">
<input name="check" type="CHECKBOX" value="YES" CHECKED> <input name="check" type="CHECKBOX" value="YES" CHECKED>
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td><br><input type="SUBMIT" value="Add"></td> <td><br><input type="SUBMIT" value="Add"></td>
</tr> </tr>
</table> </table>
</form> </form>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
respect, it's equivalent to transactions turned off. respect, it's equivalent to transactions turned off.
<p> <p>
Transactions are highly recommended. Using a named lock in Transactions are highly recommended. Using a named lock in
conjunctions with transactions is probably pointless. conjunctions with transactions is probably pointless.
</dd></dl> </dd></dl>
</body> </body>
......
product/ZMySQLDDA/help/db.py
View file @ 19479af1
class DB: class DB:
"""This is the ZMySQLDDA Database Deferred Connection Object.""" """This is the ZMySQLDDA Deferred Database Connection Object."""
def __init__(self,connection): def __init__(self,connection):
""" """
connection connection
blah blah blah blah
""" """
def tables(self, rdb=0, def tables(self, rdb=0,
_care=('TABLE', 'VIEW')): _care=('TABLE', 'VIEW')):
"""Returns a list of tables in the current database.""" """Returns a list of tables in the current database."""
...@@ -20,7 +20,7 @@ class DB: ...@@ -20,7 +20,7 @@ class DB:
def _begin(self, *ignored): def _begin(self, *ignored):
"""Begin a transaction (when TM is enabled).""" """Begin a transaction (when TM is enabled)."""
def _finish(self, *ignored): def _finish(self, *ignored):
"""Commit a transaction (when TM is enabled).""" """Commit a transaction (when TM is enabled)."""
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7