| Révision | f161371848e8a719e72569d482b5f463bead85bd (tree) |
|---|---|
| l'heure | 2020-02-01 06:39:02 |
| Auteur |  Dreas Nielsen <dreas.nielsen@gmai...> |
| Commiter | Dreas Nielsen |
Allowed forward slashes in schema and table names used with the COPY metacommand.
execsql/execsql.py (diff) setup.py (diff)| @@ -27,12 +27,12 @@ | ||
| 27 | 27 | # |
| 28 | 28 | # =============================================================================== |
| 29 | 29 | |
| 30 | -__version__ = "1.59.2`" | |
| 30 | +__version__ = "1.59.3`" | |
| 31 | 31 | __vdate = "2020-01-31" |
| 32 | 32 | |
| 33 | 33 | primary_vno = 1 |
| 34 | 34 | secondary_vno = 59 |
| 35 | -tertiary_vno = 2 | |
| 35 | +tertiary_vno = 3 | |
| 36 | 36 | |
| 37 | 37 | import os |
| 38 | 38 | import os.path |
| @@ -9840,9 +9840,9 @@ | ||
| 9840 | 9840 | |
| 9841 | 9841 | # "COPY [<schema1>.]<table1> FROM <alias1> TO [NEW] [<schema2>.]<table2> IN <alias2>" |
| 9842 | 9842 | metacommands.append(MetaCommand(( |
| 9843 | - r'^COPY\s+(?:(?P<schema1>[A-Z][A-Z0-9_\-\:]*)\.)?(?P<table1>[A-Z][A-Z0-9_\-\:]*)\s+FROM\s+(?P<alias1>[A-Z][A-Z0-9_]*)\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?(?:(?P<schema2>[A-Z][A-Z0-9_\-\:]*)\.)?(?P<table2>[A-Z][A-Z0-9_\-\:]*)\s+IN\s+(?P<alias2>[A-Z][A-Z0-9_]*)\s*$', | |
| 9844 | - r'^COPY\s+(?:"(?P<schema1>[A-Z][A-Z0-9_\-\: ]*)"\.)?"(?P<table1>[A-Z][A-Z0-9_\-\: ]*)"\s+FROM\s+(?P<alias1>[A-Z][A-Z0-9_]*)\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?(?:"(?P<schema2>[A-Z][A-Z0-9_\-\:]*)"\.)?"(?P<table2>[A-Z][A-Z0-9_\-\:]*)"\s+IN\s+(?P<alias2>[A-Z][A-Z0-9_]*)\s*$', | |
| 9845 | - r'^COPY\s+(?:\[(?P<schema1>[A-Z][A-Z0-9_\-\: ]*)\]\.)?\[(?P<table1>[A-Z][A-Z0-9_\-\: ]*)\]\s+FROM\s+(?P<alias1>[A-Z][A-Z0-9_]*)\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?(?:\[(?P<schema2>[A-Z][A-Z0-9_\-\:]*)\]\.)?\[(?P<table2>[A-Z][A-Z0-9_\-\:]*)\]\s+IN\s+(?P<alias2>[A-Z][A-Z0-9_]*)\s*$' | |
| 9843 | + r'^COPY\s+(?:(?P<schema1>[A-Z][A-Z0-9_\-\/\:]*)\.)?(?P<table1>[A-Z][A-Z0-9_\-\/\:]*)\s+FROM\s+(?P<alias1>[A-Z][A-Z0-9_]*)\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?(?:(?P<schema2>[A-Z][A-Z0-9_\-\/\:]*)\.)?(?P<table2>[A-Z][A-Z0-9_\-\/\:]*)\s+IN\s+(?P<alias2>[A-Z][A-Z0-9_]*)\s*$', | |
| 9844 | + r'^COPY\s+(?:"(?P<schema1>[A-Z][A-Z0-9_\-\/\: ]*)"\.)?"(?P<table1>[A-Z][A-Z0-9_\-\/\: ]*)"\s+FROM\s+(?P<alias1>[A-Z][A-Z0-9_]*)\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?(?:"(?P<schema2>[A-Z][A-Z0-9_\-\/\:]*)"\.)?"(?P<table2>[A-Z][A-Z0-9_\-\/\:]*)"\s+IN\s+(?P<alias2>[A-Z][A-Z0-9_]*)\s*$', | |
| 9845 | + r'^COPY\s+(?:\[(?P<schema1>[A-Z][A-Z0-9_\-\/\: ]*)\]\.)?\[(?P<table1>[A-Z][A-Z0-9_\-\/\: ]*)\]\s+FROM\s+(?P<alias1>[A-Z][A-Z0-9_]*)\s+TO\s+(?:(?P<new>NEW|REPLACEMENT)\s+)?(?:\[(?P<schema2>[A-Z][A-Z0-9_\-\/\:]*)\]\.)?\[(?P<table2>[A-Z][A-Z0-9_\-\/\:]*)\]\s+IN\s+(?P<alias2>[A-Z][A-Z0-9_]*)\s*$' | |
| 9846 | 9846 | ), x_copy)) |
| 9847 | 9847 | |
| 9848 | 9848 |
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 | long_description = f.read() |
| 5 | 5 | |
| 6 | 6 | setuptools.setup(name='execsql', |
| 7 | - version='1.59.2', | |
| 7 | + version='1.59.3', | |
| 8 | 8 | description="Runs a SQL script against a PostgreSQL, MS-Access, SQLite, MS-SQL-Server, MySQL, MariaDB, Firebird, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables. Data can be exported in 13 different formats, including CSV, TSV, ODS, HTML, JSON, LaTeX, and Markdown tables, and using custom templates.", |
| 9 | 9 | author='Dreas Nielsen', |
| 10 | 10 | author_email='dreas.nielsen@gmail.com', |
Fork