Changeset 797

Timestamp:

16.11.2009 18:21:57 (2 years ago)

Author:

cmeier

Message:

zms-2.12.1-05

Location:

ZMS/trunk

Files:

• changes.txt (modified) (1 diff)
• version.txt (modified) (1 diff)
• zmssqldb.py (modified) (1 diff)

ZMS/trunk/changes.txt

@@ -1413 +1413 @@
 [01288] Applied fix for inlined submit-buttons after last primitive-attribute before first complex-attribute.
 --------------------------------------------------
+2009-11-13:zms2-2.12.1-05
+[01289] Restricted support to SQL-Datasource for auto re-connect and setting character-set to utf-8 on to Z MySQL Database Connection.
+--------------------------------------------------

ZMS/trunk/version.txt

@@ -1 @@
-ZMS2 2.12.1-04
+ZMS2 2.12.1-05

ZMS/trunk/zmssqldb.py

@@ -223 +223 @@
     def getDA(self):
       da = getattr(self,self.connection_id)
-      # Try to re-connect if not connected.
-      try: 
-        dbc = da._v_database_connection 
-      except AttributeError: 
-        da.connect(da.connection_string) 
-        dbc = da._v_database_connection
-      # Try to set character-set to utf-8 (should at least work on MySql).
-      try:
-        dbc.query('SET NAMES utf8') 
-        dbc.query('SET CHARACTER SET utf8')
-      except:
-        pass
+      if da.meta_type == 'Z MySQL Database Connection':
+        # Try to re-connect if not connected.
+        try: 
+          dbc = da._v_database_connection 
+        except AttributeError: 
+          da.connect(da.connection_string) 
+          dbc = da._v_database_connection
+        # Try to set character-set to utf-8.
+        try:
+          dbc.query('SET NAMES utf8') 
+          dbc.query('SET CHARACTER SET utf8')
+        except:
+          pass
       return da