diff options
| -rwxr-xr-x | bin/q | 4 | ||||
| -rwxr-xr-x | test/test-suite | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -887,8 +887,8 @@ class TableCreator(object): if self.mode == 'relaxed': if actual_col_count > expected_col_count: xxx = col_vals[:expected_col_count - 1] + \ - [self.input_delimiter.join( - col_vals[expected_col_count - 1:])] + [self.input_delimiter.join([v if v is not None else '' for v in + col_vals[expected_col_count - 1:]])] return xxx else: return col_vals diff --git a/test/test-suite b/test/test-suite index e041e0d..0157daf 100755 --- a/test/test-suite +++ b/test/test-suite @@ -1719,7 +1719,7 @@ class SqlTests(AbstractQTestCase): self.assertEquals(o[4],' `float_number` - float') # Check column types detected when actual detection is disabled - cmd = '../bin/q -A -d , -H --disable-column-type-detection "select * from %s"' % (tmpfile.name) + cmd = '../bin/q -A -d , -H --as-text "select * from %s"' % (tmpfile.name) retcode, o, e = run_command(cmd) @@ -1748,7 +1748,7 @@ class SqlTests(AbstractQTestCase): self.assertEquals(o[3],"regular text 4,-123,-123,122.2"); # Get actual data without detection - cmd = '../bin/q -d , -H --disable-column-type-detection "select * from %s"' % (tmpfile.name) + cmd = '../bin/q -d , -H --as-text "select * from %s"' % (tmpfile.name) retcode, o, e = run_command(cmd) |