bug fix

stamparm · stamparm · commit bbffea2cbc20 · 2010-12-09T17:10:22.000Z
diff --git a/lib/core/unescaper.py b/lib/core/unescaper.py
@@ -7,16 +7,14 @@
 See the file 'doc/COPYING' for copying permission
 """
 
+from lib.core.data import kb
 from lib.core.datatype import advancedDict
 
 class Unescaper(advancedDict):
     def __init__(self):
-        self.__unescaper = None
-
-    def setUnescape(self, unescapeFunction):
-        self.__unescaper = unescapeFunction
+        pass
 
     def unescape(self, expression, quote=True):
-        return self.__unescaper(expression, quote=quote)
+        return self[kb.dbms if kb.dbms else kb.misc.testedDbms](expression, quote=quote)
 
 unescaper = Unescaper()
diff --git a/plugins/dbms/access/__init__.py b/plugins/dbms/access/__init__.py
@@ -33,5 +33,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.ACCESS] = AccessMap.unescape
-        unescaper.setUnescape(AccessMap.unescape)
+    unescaper[DBMS.ACCESS] = Syntax.unescape
diff --git a/plugins/dbms/firebird/__init__.py b/plugins/dbms/firebird/__init__.py
@@ -33,5 +33,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.FIREBIRD] = FirebirdMap.unescape
-        unescaper.setUnescape(FirebirdMap.unescape)
+    unescaper[DBMS.FIREBIRD] = Syntax.unescape
diff --git a/plugins/dbms/maxdb/__init__.py b/plugins/dbms/maxdb/__init__.py
@@ -33,5 +33,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.MAXDB] = MaxDBMap.unescape
-        unescaper.setUnescape(MaxDBMap.unescape)
+    unescaper[DBMS.MAXDB] = Syntax.unescape
diff --git a/plugins/dbms/mssqlserver/__init__.py b/plugins/dbms/mssqlserver/__init__.py
@@ -34,5 +34,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.MSSQL] = MSSQLServerMap.unescape
-        unescaper.setUnescape(MSSQLServerMap.unescape)
+    unescaper[DBMS.MSSQL] = Syntax.unescape
diff --git a/plugins/dbms/mysql/__init__.py b/plugins/dbms/mysql/__init__.py
@@ -39,5 +39,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.MYSQL] = MySQLMap.unescape
-        unescaper.setUnescape(MySQLMap.unescape)
+    unescaper[DBMS.MYSQL] = Syntax.unescape
diff --git a/plugins/dbms/oracle/__init__.py b/plugins/dbms/oracle/__init__.py
@@ -33,5 +33,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.ORACLE] = OracleMap.unescape
-        unescaper.setUnescape(OracleMap.unescape)
+    unescaper[DBMS.ORACLE] = Syntax.unescape
diff --git a/plugins/dbms/postgresql/__init__.py b/plugins/dbms/postgresql/__init__.py
@@ -40,5 +40,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.PGSQL] = PostgreSQLMap.unescape
-        unescaper.setUnescape(PostgreSQLMap.unescape)
+    unescaper[DBMS.PGSQL] = Syntax.unescape
diff --git a/plugins/dbms/sqlite/__init__.py b/plugins/dbms/sqlite/__init__.py
@@ -33,5 +33,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.SQLITE] = SQLiteMap.unescape
-        unescaper.setUnescape(SQLiteMap.unescape)
+    unescaper[DBMS.SQLITE] = Syntax.unescape
diff --git a/plugins/dbms/sybase/__init__.py b/plugins/dbms/sybase/__init__.py
@@ -33,5 +33,4 @@ def __init__(self):
         Miscellaneous.__init__(self)
         Takeover.__init__(self)
 
-        unescaper[DBMS.SYBASE] = SybaseMap.unescape
-        unescaper.setUnescape(SybaseMap.unescape)
+    unescaper[DBMS.SYBASE] = Syntax.unescape
