Error if --overwrite is combined with --no-create, closes #989

wireservice · Oct 9, 2018 · a5e792a · a5e792a
1 parent 6d280f5
commit a5e792a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/csvkit/utilities/csvsql.py b/csvkit/utilities/csvsql.py
@@ -46,7 +46,7 @@ def add_arguments(self):
         self.argparser.add_argument('--create-if-not-exists', dest='create_if_not_exists', action='store_true',
                                     help='Create table if it does not exist, otherwise keep going. Only valid when --insert is specified.')
         self.argparser.add_argument('--overwrite', dest='overwrite', action='store_true',
-                                    help='Drop the table before creating. Only valid when --insert is specified.')
+                                    help='Drop the table before creating. Only valid when --insert is specified and --no-create is not specified.')
         self.argparser.add_argument('--db-schema', dest='db_schema',
                                     help='Optional name of database schema to create table(s) in.')
         self.argparser.add_argument('-y', '--snifflimit', dest='sniff_limit', type=int,
@@ -86,6 +86,8 @@ def main(self):
             self.argparser.error('The --create-if-not-exists option is only valid if --insert is also specified.')
         if self.args.overwrite and not self.args.insert:
             self.argparser.error('The --overwrite option is only valid if --insert is also specified.')
+        if self.args.overwrite and self.args.no_create:
+            self.argparser.error('The --overwrite option is only valid if --no-create is not specified.')
         if self.args.before_insert and not self.args.insert:
             self.argparser.error('The --before-insert option is only valid if --insert is also specified.')
         if self.args.after_insert and not self.args.insert:

diff --git a/docs/scripts/csvsql.rst b/docs/scripts/csvsql.rst
@@ -57,7 +57,8 @@ Generate SQL statements for a CSV file or execute those statements directly on a
                             Create table if it does not exist, otherwise keep
                             going. Only valid when --insert is specified.
       --overwrite           Drop the table before creating. Only valid when
-                            --insert is specified.
+                            --insert is specified and --no-create is not
+                            specified.
       --db-schema DB_SCHEMA
                             Optional name of database schema to create table(s)
                             in.