natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIx cqlsh COPY FROM without explicit column names. 

Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4470
This commit is contained in:
Brandon Williams 2012-07-29 11:48:44 -05:00
parent 5f184a04ad
commit fc8e4b5656
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/cqlsh
View File

@ -1526,14 +1526,14 @@ class Shell(cmd.Cmd):
try:
if header:
linesource.next()
prepq = self.prep_import_insert(ks, cf, columns)
numcol, prepq = self.prep_import_insert(ks, cf, columns)
rownum = -1
reader = csv.reader(linesource, **dialect_options)
for rownum, row in enumerate(reader):
if len(row) != len(columns):
if len(row) != numcol:
self.printerr("Record #%d (line %d) has the wrong number of fields "
"(%d instead of %d)."
% (rownum, reader.line_num, len(row), len(columns)))
% (rownum, reader.line_num, len(row), numcol))
return rownum
if not self.do_import_insert(prepq, row):
self.printerr("Aborting import at record #%d (line %d). "
@ -1557,7 +1557,7 @@ class Shell(cmd.Cmd):
# values already, reading them from text just like the various
# Cassandra cql types do. Better just to submit them all as intact
# CQL string literals and let Cassandra do its thing.
return 'INSERT INTO %s.%s (%s) VALUES (%%s)' % (
return len(columns), 'INSERT INTO %s.%s (%s) VALUES (%%s)' % (
self.cql_protect_name(ks),
self.cql_protect_name(cf),
', '.join(map(self.cql_protect_name, columns))