diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-03-27 16:04:34 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-03-27 16:04:34 +0000 |
| commit | 32440f2b3b61deda5bd8ee0abf707b76f44c926d (patch) | |
| tree | 027bb110eed295ad768564049d548c07272a035e /lib/sqlalchemy/engine/base.py | |
| parent | 363405aa9982fe46096f8b4991a59baf5e09294d (diff) | |
| download | sqlalchemy-32440f2b3b61deda5bd8ee0abf707b76f44c926d.tar.gz | |
- preliminary support for unicode table and column names added.
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 7f7bde81b..eb397d774 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -494,7 +494,7 @@ class Connection(Connectable): if not compiled.can_execute: raise exceptions.ArgumentError("Not an executeable clause: %s" % (str(compiled))) cursor = self.__engine.dialect.create_cursor(self.connection) - parameters = [compiled.get_params(**m) for m in self._params_to_listofdicts(*multiparams, **params)] + parameters = [compiled.construct_params(m) for m in self._params_to_listofdicts(*multiparams, **params)] if len(parameters) == 1: parameters = parameters[0] def proxy(statement=None, parameters=None): @@ -506,7 +506,7 @@ class Connection(Connectable): return cursor context = self.__engine.dialect.create_execution_context() context.pre_exec(self.__engine, proxy, compiled, parameters) - proxy(str(compiled), parameters) + proxy(unicode(compiled), parameters) context.post_exec(self.__engine, proxy, compiled, parameters) rpargs = self.__engine.dialect.create_result_proxy_args(self, cursor) return ResultProxy(self.__engine, self, cursor, context, typemap=compiled.typemap, column_labels=compiled.column_labels, **rpargs) @@ -544,16 +544,13 @@ class Connection(Connectable): def _execute_raw(self, statement, parameters=None, cursor=None, context=None, **kwargs): if cursor is None: cursor = self.__engine.dialect.create_cursor(self.connection) - try: - self.__engine.logger.info(statement) - self.__engine.logger.info(repr(parameters)) - if parameters is not None and isinstance(parameters, list) and len(parameters) > 0 and (isinstance(parameters[0], list) or isinstance(parameters[0], dict)): - self._executemany(cursor, statement, parameters, context=context) - else: - self._execute(cursor, statement, parameters, context=context) - self._autocommit(statement) - except: - raise + self.__engine.logger.info(statement) + self.__engine.logger.info(repr(parameters)) + if parameters is not None and isinstance(parameters, list) and len(parameters) > 0 and (isinstance(parameters[0], list) or isinstance(parameters[0], dict)): + self._executemany(cursor, statement, parameters, context=context) + else: + self._execute(cursor, statement, parameters, context=context) + self._autocommit(statement) return cursor def _execute(self, c, statement, parameters, context=None): |