Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FA1418455 for ; Thu, 5 Nov 2015 14:35:48 +0000 (UTC) Received: (qmail 95450 invoked by uid 500); 5 Nov 2015 14:35:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95419 invoked by uid 500); 5 Nov 2015 14:35:48 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 95398 invoked by uid 99); 5 Nov 2015 14:35:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2015 14:35:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DEB4FE3926; Thu, 5 Nov 2015 14:35:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Thu, 05 Nov 2015 14:35:47 -0000 Message-Id: <0d1d8d8f354d4cec8f96433425644bfa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Fix cqlsh type handling after driver metadata api change Repository: cassandra Updated Branches: refs/heads/trunk 2a4b8f10e -> c42fcf570 Fix cqlsh type handling after driver metadata api change patch by Paulo Motta; reviewed by Aleksey Yeschenko Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9940892c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9940892c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9940892c Branch: refs/heads/trunk Commit: 9940892c3c89e1780cfbda72bfe8c19bd4b1e36a Parents: 454f32d Author: Paulo Motta Authored: Thu Nov 5 06:13:58 2015 -0800 Committer: Aleksey Yeschenko Committed: Thu Nov 5 14:35:01 2015 +0000 ---------------------------------------------------------------------- bin/cqlsh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9940892c/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 725f6e9..23d4444 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -2394,7 +2394,7 @@ class ImportProcess(multiprocessing.Process): table_meta = new_cluster.metadata.keyspaces[self.ks].tables[self.cf] pk_cols = [col.name for col in table_meta.primary_key] - cqltypes = [table_meta.columns[name].typestring for name in self.columns] + cqltypes = [table_meta.columns[name].cql_type for name in self.columns] pk_indexes = [self.columns.index(col.name) for col in table_meta.primary_key] query = 'INSERT INTO %s.%s (%s) VALUES (%%s)' % ( protect_name(table_meta.keyspace_name),