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 07E5510A05 for ; Wed, 15 Jan 2014 18:09:25 +0000 (UTC) Received: (qmail 69288 invoked by uid 500); 15 Jan 2014 18:09:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 69262 invoked by uid 500); 15 Jan 2014 18:09:24 -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 69253 invoked by uid 99); 15 Jan 2014 18:09:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jan 2014 18:09:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E4F0D834052; Wed, 15 Jan 2014 18:09:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Make sure both type name are prepared for a type rename Date: Wed, 15 Jan 2014 18:09:23 +0000 (UTC) Updated Branches: refs/heads/trunk 312286772 -> 2966852a0 Make sure both type name are prepared for a type rename Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2966852a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2966852a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2966852a Branch: refs/heads/trunk Commit: 2966852a03faecf4ef2dbbc99da98f414826d0cf Parents: 3122867 Author: Sylvain Lebresne Authored: Wed Jan 15 19:08:44 2014 +0100 Committer: Sylvain Lebresne Committed: Wed Jan 15 19:09:18 2014 +0100 ---------------------------------------------------------------------- .../cassandra/cql3/statements/AlterTypeStatement.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2966852a/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java index dd88aca..61a4e35 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java @@ -352,6 +352,18 @@ public abstract class AlterTypeStatement extends SchemaAlteringStatement this.newName = newName; } + @Override + public void prepareKeyspace(ClientState state) throws InvalidRequestException + { + super.prepareKeyspace(state); + + if (!newName.hasKeyspace()) + newName.setKeyspace(state.getKeyspace()); + + if (newName.getKeyspace() == null) + throw new InvalidRequestException("You need to be logged in a keyspace or use a fully qualified user type name"); + } + protected UserType makeUpdatedType(UserType toUpdate) throws InvalidRequestException { KSMetaData ksm = Schema.instance.getKSMetaData(newName.getKeyspace());