From 9497191f5bab126c4d83ccbe023554fd6ea95257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81s=20de=20la=20Pen=CC=83a?= Date: Thu, 24 Aug 2017 16:29:11 +0100 Subject: [PATCH] Copy session properties on cqlsh.py do_login MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit patch by Andres de la Peña; reviewed by Zhao Yang for CASSANDRA-13640 --- CHANGES.txt | 1 + bin/cqlsh.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 1525289125..936b72c6f5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.15 + * Copy session properties on cqlsh.py do_login (CASSANDRA-13640) * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573) * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737) * Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730) diff --git a/bin/cqlsh.py b/bin/cqlsh.py index c132592f2d..8eb42a3009 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -2206,6 +2206,12 @@ class Shell(cmd.Cmd): else: session = conn.connect() + # Copy session properties + session.default_timeout = self.session.default_timeout + session.row_factory = self.session.row_factory + session.default_consistency_level = self.session.default_consistency_level + session.max_trace_wait = self.session.max_trace_wait + # Update after we've connected in case we fail to authenticate self.conn = conn self.auth_provider = auth_provider