Fossil SCM
Cherry-pick [http://www.sqlite.org/src/info/9c2e7612cd|9c2e7612cd]: In the command-line shell for CSV import, if the lines are \r\n terminated and the last field is blank, make sure an empty string and not a "\r" string is imported.
Commit
60fd4222755ad6e5e1bfae77e1d994b1c77bd483
Parent
782c3bd265c38bd…
1 file changed
+1
-1
+1
-1
| --- src/shell.c | ||
| +++ src/shell.c | ||
| @@ -1891,11 +1891,11 @@ | ||
| 1891 | 1891 | csv_append_char(p, c); |
| 1892 | 1892 | c = fgetc(p->in); |
| 1893 | 1893 | } |
| 1894 | 1894 | if( c=='\n' ){ |
| 1895 | 1895 | p->nLine++; |
| 1896 | - if( p->n>1 && p->z[p->n-1]=='\r' ) p->n--; | |
| 1896 | + if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--; | |
| 1897 | 1897 | } |
| 1898 | 1898 | p->cTerm = c; |
| 1899 | 1899 | } |
| 1900 | 1900 | if( p->z ) p->z[p->n] = 0; |
| 1901 | 1901 | return p->z; |
| 1902 | 1902 |
| --- src/shell.c | |
| +++ src/shell.c | |
| @@ -1891,11 +1891,11 @@ | |
| 1891 | csv_append_char(p, c); |
| 1892 | c = fgetc(p->in); |
| 1893 | } |
| 1894 | if( c=='\n' ){ |
| 1895 | p->nLine++; |
| 1896 | if( p->n>1 && p->z[p->n-1]=='\r' ) p->n--; |
| 1897 | } |
| 1898 | p->cTerm = c; |
| 1899 | } |
| 1900 | if( p->z ) p->z[p->n] = 0; |
| 1901 | return p->z; |
| 1902 |
| --- src/shell.c | |
| +++ src/shell.c | |
| @@ -1891,11 +1891,11 @@ | |
| 1891 | csv_append_char(p, c); |
| 1892 | c = fgetc(p->in); |
| 1893 | } |
| 1894 | if( c=='\n' ){ |
| 1895 | p->nLine++; |
| 1896 | if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--; |
| 1897 | } |
| 1898 | p->cTerm = c; |
| 1899 | } |
| 1900 | if( p->z ) p->z[p->n] = 0; |
| 1901 | return p->z; |
| 1902 |