Commit Graph

295 Commits

Author SHA1 Message Date
Brandon Williams 0cc168a966 Fix cqlsh ASSUME broken by CASSANDRA-4198.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4352
2012-06-18 13:09:50 -05:00
Brandon Williams 55d4dd6547 Add an option to cqlsh to authenticate to a keyspace by default.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4108
2012-06-01 12:56:49 -05:00
Brandon Williams 38748b43d8 cqlsh: update recognized syntax for cql3
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4198
2012-05-18 10:22:23 -05:00
Brandon Williams 51767c198d Merge from 1.0 2012-05-15 17:24:26 -05:00
Brandon Williams be9fa05d06 Enable piping to cqlsh with locale.getpreferredencoding()
Patch by paul cannon, reviewd by brandonwilliams for CASSANDRA-4113
2012-05-15 17:19:04 -05:00
Brandon Williams 44e7a08903 Cqlsh: fix 'describe columnfamily' from CASSADRA-4164
Patch by paul cannon, reviewed by brandonwilliams
2012-05-04 12:42:28 -05:00
Brandon Williams f1ee34f08f cqlsh: in cql3 mode, use cql3 quoting when outputting cql.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4173
2012-05-01 09:48:27 -05:00
Brandon Williams b81f5723ef Cqlsh supports DESCRIBE on cql3-style composite CFs.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4164
2012-04-27 16:05:42 -05:00
Jonathan Ellis dc975e8ac3 fix recognizing uppercase SELECT keyword
patch by Jonas Dohse and pcannon for CASSANDRA-4161
2012-04-19 14:00:32 -05:00
paul cannon 8df0cea779 allow cql version selection 2012-04-06 11:03:52 -05:00
Brandon Williams 2ca983d9c0 Merge from 1.0 2012-04-05 15:09:44 -05:00
Jonathan Ellis c9f88103d0 guess correct version of Python for Arch Linux
patch by Andrew Ash and Paul Cannon for CASSANDRA-4090
2012-04-03 11:12:13 -05:00
Brandon Williams e4e87661d5 Restore defaultdict import 2012-03-30 14:31:56 -05:00
Brandon Williams e3c4c095f0 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-03-27 14:30:51 -05:00
Brandon Williams 270d0165da cqlsh: check for cql driver colname type support, overhaul column coloring
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4003
2012-03-27 14:29:10 -05:00
Brandon Williams 9fc1d5c23a cqlsh: fix col. width in presence of wide unicode glyphs
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4033
2012-03-27 13:51:02 -05:00
Sylvain Lebresne d64b9fff57 cqlsh: tab-complete key alias for ALTER CF ALTER
patch by thepaul; reviewed by slebresne for CASSANDRA-3873
2012-02-24 11:20:14 +01:00
Sylvain Lebresne c691e09f14 Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-22 11:39:44 +01:00
paul cannon 44ac7a04e0 cqlsh: look for cqlshlib relative to realpath
patch by thepaul; reviewed by slebresne for CASSANDRA-3767

i.e., the realpath of the cqlsh executable, instead of the path as
called, which could be a symlink. If cqlsh is called via symlink, we are
more likely to find cqlshlib relative to the real location than relative
to the symlink.
2012-02-22 11:38:46 +01:00
Sylvain Lebresne 40bb5509b9 Extra change for #3933 for 1.1 2012-02-22 11:32:17 +01:00
Sylvain Lebresne d9124ed68c Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-22 11:30:50 +01:00
paul cannon 1ad1c12829 cqlsh: ignore missing CfDef opts
patch by thepaul; reviewed by slebresne for CASSANDRA-3933

We don't want to try to track every possible CF
option supported by different versions of Cassandra, so if we try
to reference one and it's not in the object at all, that's fine,
don't try to display it.
2012-02-22 11:29:52 +01:00
Brandon Williams 9417eb6299 cqlsh: handle deserialization errors.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-3874
2012-02-16 09:23:42 -06:00
Brandon Williams cd36f97571 cqlsh: handle deserialization errors.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-3874
2012-02-16 09:21:55 -06:00
Brandon Williams 0f3ff051ef Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-06 14:58:59 -06:00
paul cannon b527d9ffe1 Fix cqlsh data display on python <2.7
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-3846
2012-02-06 13:32:03 -06:00
paul cannon d4f2051578 cqlsh: update syntax for tab completions
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3757
2012-01-30 15:43:53 -06:00
paul cannon 8a5436a2b6 add cqlsh to Debian package 2012-01-29 19:09:34 -06:00
paul cannon 1387d92fcd cqlsh version 2.0.0 -> 2.1.0 2012-01-29 19:01:25 -06:00
paul cannon b6344887c2 cqlsh: use python-cql and thrift bindings from lib
..if possible.
2012-01-29 19:01:25 -06:00
paul cannon d5979b3017 Add read from/write to support for cqlsh.
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3479
2012-01-25 21:46:48 -06:00
Jonathan Ellis c641acca70 merge from 1.0 2012-01-20 13:23:31 -06:00
paul cannon 5850178cb9 cqlsh: format output properly, make prettier
most importantly: formats output from queries according to column
storage type, so that e.g. blob data is shown in hex. also formats
timestamp values in a human-readable and cql-readable way, and
shows backslash escapes for text/ascii types when characters can't
be printed. when color is enabled, highlight backslash escapes in
red, so they can easily be distinguished from text that happens to
contain backslashes.

color different types of column data differently: textual data stays
yellow, blob data is red, and other data (types which are shown and
input significantly differently from the byte representation, like
numbers, timestamps, etc) are green.

for static resultsets, add a separator line between header and data
(most helpful for people who don't have colors on). left-justify column
headers instead of right-justifying. for dynamic resultsets, don't
append a final bar separator after the last value.

allow calling into a value renderer/formatter which can make decisions
about output representation and color based on the column type

patch by pcannon; reviewed by jbellis for CASSANDRA-3726
2012-01-20 13:22:38 -06:00
Jonathan Ellis 91c45d445c merge from 1.0 2012-01-19 17:04:29 -06:00
paul cannon fc6103966c add DESC alias for DESCRIBE
patch by pcannon; reviewed by jbellis for CASSANDRA-3587
2012-01-19 17:03:02 -06:00
paul cannon 95942f0221 cqlsh: add DESC COLUMNFAMILIES to show cf names
as opposed to DESCRIBE KEYSPACE, which shows all columnfamilies but
includes all their column definitions and options, which is usually a
lot of output.

patch by pcannon; reviewed by jbellis for CASSANDRA-3586
2012-01-19 17:02:36 -06:00
paul cannon f458cc1ad9 add ALTER COLUMNFAMILY WITH
allows modification of columnfamily properties after creation

patch by pcannon; reviewed by jbellis for CASSANDRA-3523
2012-01-16 13:28:40 -06:00
Brandon Williams 2bb862c320 Add help for INSERT to cqlsh.
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3718.
2012-01-10 13:59:50 -06:00
Eric Evans 8f777d4226 cqlsh: fix broken help output methods
Patch by paul cannon; reviewed by eevans for CASSANDRA-3588

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1211958 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 16:29:53 +00:00
Jonathan Ellis 233de993ce s/bash/sh/
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1209348 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 03:10:22 +00:00
Jonathan Ellis 77ad368ed5 update cqlsh to find a python >= 2.5, if possible
patch by Paul Cannon; reviewed by jbellis for CASSANDRA-3457

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1209343 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 03:01:05 +00:00
Brandon Williams b23a805925 Fix ASSUME when using SELECT keyspace.cfname syntax in cqlsh.
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3500

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1207616 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 21:19:15 +00:00
Jonathan Ellis 6e088d48f3 don't use cqlsh color on Windows
patch by Paul Cannon; reviewed by jbellis for for CASSANDRA-3131

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1201080 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 22:32:17 +00:00
Jonathan Ellis b1b1772f35 svn propset svn:executable on bin/cqlsh
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1200539 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 20:37:14 +00:00
Jonathan Ellis 1bb2947dd5 add next-gen cqlsh
patch by Paul Cannon; reviewed by jbellis for CASSANDRA-3188

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1198994 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 23:05:54 +00:00