]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- logging has been overhauled such that engines no longer need to encode the
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 20 Nov 2010 21:28:39 +0000 (16:28 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 20 Nov 2010 21:28:39 +0000 (16:28 -0500)
"hex id" string in their logging name in order to maintain separate loggers
per engine. thanks to Vinay Sajip for assistance.  merge of [ticket:1926]

1  2 
lib/sqlalchemy/engine/base.py
lib/sqlalchemy/pool.py
test/engine/test_execute.py

index 326c33f2db27eb25bbe77dabe8ef3455829e0c70,c182221ca753daf8dd532862efb636fa0913edca..c07c83a07d040f8e5fc526fce43b9c654ed01634
@@@ -1624,15 -1622,13 +1624,15 @@@ class Engine(Connectable, log.Identifie
              self.logging_name = logging_name
          self.echo = echo
          self.engine = self
-         self.logger = log.instance_logger(self, echoflag=echo)
+         log.instance_logger(self, echoflag=echo)
          if proxy:
 -            self.Connection = _proxy_connection_cls(Connection, proxy)
 -        else:
 -            self.Connection = Connection
 +#            util.warn_deprecated("The 'proxy' argument to create_engine() is deprecated.  Use event.listen().")
 +            interfaces.ConnectionProxy._adapt_listener(self, proxy)
          if execution_options:
              self.update_execution_options(**execution_options)
 +
 +            
 +    dispatch = event.dispatcher(events.EngineEvents)
      
      def update_execution_options(self, **opt):
          """update the execution_options dictionary of this :class:`Engine`.
Simple merge
Simple merge