Rename mysql2sql -> sqlconvert

diff --git a/README.txt b/README.txt
index 64b1299f4800a9735a6d09dc435e4c0dc3c6ec10..86b1b0513690252b34a648759d32039955bd8109 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,11 +1,12 @@
-Broytman mysql to sql converter, Copyright (C) 2016 PhiloSoft Design
+Broytman SQL converter, Copyright (C) 2016 PhiloSoft Design
 Author: Oleg Broytman <phd@phdru.name>
 License: GPL
 
-This is mysql2sql, a mysql to sql converter. Intended primarily to
-convert mysqldump (especially with extended INSERT syntax) to standard
-SQL to load at least to PostgreSQL or SQLite.
+This is sqlconvert, a a library to perform SQL convertions. It uses
+sqlparse to parse SQL.
 
-Uses sqlparse to parse SQL.
+The library is in its initial phase and currently cannot do much.
 
-The program is in its initial phase and currently cannot do much.
+The first goal is to implemet mysq2sql, a script intended primarily to
+convert mysqldump output (especially with extended INSERT syntax) to
+standard SQL to load at least to PostgreSQL or SQLite.

diff --git a/demo/group-file.py b/demo/group-file.py
index 5ab1f447ea2f48bf61c5dae14db4ccc8a29f4675..54d1cc26795f2ecd4df8422a94c9595351741b54 100755 (executable)
--- a/demo/group-file.py
+++ b/demo/group-file.py
@@ -2,8 +2,8 @@
 from __future__ import print_function
 
 import sys
-from mysql2sql.print_tokens import print_tokens
-from mysql2sql.process_tokens import requote_names, find_error, \
+from sqlconvert.print_tokens import print_tokens
+from sqlconvert.process_tokens import requote_names, find_error, \
     StatementGrouper
 
 

diff --git a/demo/group-sql.py b/demo/group-sql.py
index 953e9e7cfc66a03304af31cdc7473ec584fd1a7f..25493d5b381d0bf5441b00d207127d2de150e650 100755 (executable)
--- a/demo/group-sql.py
+++ b/demo/group-sql.py
@@ -2,8 +2,8 @@
 from __future__ import print_function
 
 import sys
-from mysql2sql.print_tokens import print_tokens
-from mysql2sql.process_tokens import requote_names, find_error, \
+from sqlconvert.print_tokens import print_tokens
+from sqlconvert.process_tokens import requote_names, find_error, \
     StatementGrouper
 
 

diff --git a/demo/parse-file.py b/demo/parse-file.py
index a701bfec217cf0e6386a9c9aab760a2085dd79e1..34a99b727226706194157a3625e2bb797bb02a37 100755 (executable)
--- a/demo/parse-file.py
+++ b/demo/parse-file.py
@@ -3,8 +3,8 @@ from __future__ import print_function
 
 import sys
 from sqlparse import parse
-from mysql2sql.print_tokens import print_tokens
-from mysql2sql.process_tokens import requote_names, find_error
+from sqlconvert.print_tokens import print_tokens
+from sqlconvert.process_tokens import requote_names, find_error
 
 
 def main(filename):

diff --git a/demo/parse-sql.py b/demo/parse-sql.py
index f34178a706b5c894f7bead750561c0e6ed1efe31..cb3f1656f3ebb182e7adbd4a8845701245fe3750 100755 (executable)
--- a/demo/parse-sql.py
+++ b/demo/parse-sql.py
@@ -3,8 +3,8 @@ from __future__ import print_function
 
 import sys
 from sqlparse import parse
-from mysql2sql.print_tokens import print_tokens
-from mysql2sql.process_tokens import requote_names, find_error
+from sqlconvert.print_tokens import print_tokens
+from sqlconvert.process_tokens import requote_names, find_error
 
 
 def main(*queries):

diff --git a/docs/Makefile b/docs/Makefile
index fc957c0a18edf4519d5c0079be5679f19d559832..154937d92ae40083291178740f735b6ee203bdae 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -91,9 +91,9 @@ qthelp:
        @echo
        @echo "Build finished; now you can run "qcollectiongenerator" with the" \
              ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-       @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/mysql2sql.qhcp"
+       @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/sqlconvert.qhcp"
        @echo "To view the help file:"
-       @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/mysql2sql.qhc"
+       @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/sqlconvert.qhc"
 
 .PHONY: applehelp
 applehelp:
@@ -110,8 +110,8 @@ devhelp:
        @echo
        @echo "Build finished."
        @echo "To view the help file:"
-       @echo "# mkdir -p $$HOME/.local/share/devhelp/mysql2sql"
-       @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/mysql2sql"
+       @echo "# mkdir -p $$HOME/.local/share/devhelp/sqlconvert"
+       @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/sqlconvert"
        @echo "# devhelp"
 
 .PHONY: epub

diff --git a/docs/conf.py b/docs/conf.py
index 2246d74fb51c0ce9487a59f3763c5dfcba67afdc..6b2662630d10faf7e76cb352e6de181b98b954d4 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# mysql2sql documentation build configuration file, created by
+# sqlconvert documentation build configuration file, created by
 # sphinx-quickstart on Fri Jul 22 19:32:24 2016.
 #
 # This file is execfile()d with the current directory set to its
@@ -51,7 +51,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'mysql2sql'
+project = u'sqlconvert'
 copyright = u'2016, Oleg Broytman'
 author = u'Oleg Broytman'
 
@@ -136,7 +136,7 @@ html_theme = 'alabaster'
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'mysql2sql v0.0.1'
+# html_title = u'sqlconvert v0.0.1'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #
@@ -236,7 +236,7 @@ html_static_path = ['_static']
 # html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'mysql2sqldoc'
+htmlhelp_basename = 'sqlconvert_doc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -262,7 +262,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'mysql2sql.tex', u'mysql2sql Documentation',
+    (master_doc, 'sqlconvert.tex', u'sqlconvert Documentation',
      u'Oleg Broytman', 'manual'),
 ]
 
@@ -304,7 +304,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'mysql2sql', u'mysql2sql Documentation',
+    (master_doc, 'sqlconvert', u'sqlconvert Documentation',
      [author], 1)
 ]
 
@@ -319,8 +319,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'mysql2sql', u'mysql2sql Documentation',
-     author, 'mysql2sql', 'One line description of project.',
+    (master_doc, 'sqlconvert', u'sqlconvert Documentation',
+     author, 'sqlconvert', 'One line description of project.',
      'Miscellaneous'),
 ]
 

diff --git a/docs/genapidocs b/docs/genapidocs
index f27f44a20fa32c018411817122d01912510219e9..881ecab161c849b94fa725a4fbd4a1a48e0fbc1d 100755 (executable)
--- a/docs/genapidocs
+++ b/docs/genapidocs
@@ -2,4 +2,4 @@
 
 cd "`dirname $0`"/.. &&
 exec sphinx-apidoc --separate --module-first --suffix=rst --force \
-   --output-dir=docs/api mysql2sql
+   --output-dir=docs/api sqlconvert

diff --git a/docs/index.rst b/docs/index.rst
index 242918a82b9662afe66a49842caaa5a6d2d06e45..46e6c4592324f04f88b8327e118745759792b220 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,57 +1,26 @@
-.. mysql2sql documentation master file, created by
+.. sqlconvert documentation master file, created by
    sphinx-quickstart on Fri Jul 22 19:32:24 2016.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to mysql2sql's documentation!
+Welcome to sqlconvert's documentation!
 =====================================
 
-This is mysql2sql, a mysql to sql converter. It is primary intended to
-convert mysqldump (especially with extended INSERT syntax) to standard
-SQL to load at least to PostgreSQL or SQLite.
-
-It uses `sqlparse <https://github.com/andialbrecht/sqlparse>`_ to parse
-SQL.
+This is sqlconvert, a library to implenet SQL converters. It uses `sqlparse
+<https://github.com/andialbrecht/sqlparse>`_ to parse SQL.
 
 The program is in its initial phase and currently cannot do much.
 
-.. highlight:: none
-
-Command line
-------------
-
-mysql2sql
-~~~~~~~~~
-
-Usage::
-
-    mysql2sql [-e encoding] [-E output_encoding] [infile] [[-o] outfile]
-
-Options::
-
-    -e ENCODING, --encoding ENCODING
-                           input/output encoding, default is utf-8
-    -E OUTPUT_ENCODING, --output-encoding OUTPUT_ENCODING
-                           separate output encoding, default is the same as
-                           `-e` except for console; for console output charset
-                           from the current locale is used
-    -P, --no-pbar          Inhibit progress bar
-    infile                 Input file, stdin if absent or '-'
-    -o, --outfile outfile  Output file, stdout if absent or '-'
-
-If stderr is connected to the console the program displays a text mode progress
-bar. Option `-P/--no-pbar` inhibits it.
-
-Option `-o` is useful when infile is absent (input is redirected), for
-example::
+The first goal is to implemet `mysq2sql <mysq2sql.html>`_, a script intended
+primarily to convert mysqldump (especially with extended INSERT syntax) to
+standard SQL to load at least to PostgreSQL or SQLite.
 
-    mysql2sql -o outfile.sql < infile.sql
-    cat infile.sql | mysql2sql -o outfile.sql
+Contents:
 
-But of course it simply can be::
+.. toctree::
+   :maxdepth: 2
 
-    mysql2sql - outfile.sql < infile.sql
-    cat infile.sql | mysql2sql - outfile.sql
+   mysq2sql
 
 
 Indices and tables

diff --git a/docs/mysql2sql.rst b/docs/mysql2sql.rst
new file mode 100644 (file)
index 0000000..aba493e
--- /dev/null
+++ b/docs/mysql2sql.rst
@@ -0,0 +1,51 @@
+.. mysql2sql documentation master file, created by
+   sphinx-quickstart on Fri Jul 22 19:32:24 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to mysql2sql's documentation!
+=====================================
+
+This is mysql2sql, a mysql to sql converter. It is primary intended to
+convert mysqldump (especially with extended INSERT syntax) to standard
+SQL to load at least to PostgreSQL or SQLite.
+
+The program is in its initial phase and currently cannot do much.
+
+.. highlight:: none
+
+Command line
+------------
+
+mysql2sql
+~~~~~~~~~
+
+Usage::
+
+    mysql2sql [-e encoding] [-E output_encoding] [infile] [[-o] outfile]
+
+Options::
+
+    -e ENCODING, --encoding ENCODING
+                           input/output encoding, default is utf-8
+    -E OUTPUT_ENCODING, --output-encoding OUTPUT_ENCODING
+                           separate output encoding, default is the same as
+                           `-e` except for console; for console output charset
+                           from the current locale is used
+    -P, --no-pbar          Inhibit progress bar
+    infile                 Input file, stdin if absent or '-'
+    -o, --outfile outfile  Output file, stdout if absent or '-'
+
+If stderr is connected to the console the program displays a text mode progress
+bar. Option `-P/--no-pbar` inhibits it.
+
+Option `-o` is useful when infile is absent (input is redirected), for
+example::
+
+    mysql2sql -o outfile.sql < infile.sql
+    cat infile.sql | mysql2sql -o outfile.sql
+
+But of course it simply can be::
+
+    mysql2sql - outfile.sql < infile.sql
+    cat infile.sql | mysql2sql - outfile.sql

diff --git a/mk-distr b/mk-distr
index 50cab8d488b760e8712d48b7e70408a7e3880a4d..88cad9ba4fa486e6e61a4f9fe1a5230e29af834b 100755 (executable)
--- a/mk-distr
+++ b/mk-distr
@@ -2,13 +2,13 @@
 
 umask 022 &&
 
-git archive --format=tar --prefix=mysql2sql/ "${1:-HEAD}" |
+git archive --format=tar --prefix=sqlconvert/ "${1:-HEAD}" |
    (cd "$HOME/tmp" && exec tar xf -) &&
 
-cp -ap docs "$HOME/tmp/mysql2sql" &&
+cp -ap docs "$HOME/tmp/sqlconvert" &&
 
-cd "$HOME/tmp/mysql2sql" &&
+cd "$HOME/tmp/sqlconvert" &&
 chmod -R u=rwX,go=rX docs &&
 
 python setup.py sdist --formats=bztar &&
-cd dist && mv mysql2sql-*.tar.bz2 ../.. && cd ../.. && exec rm -rf mysql2sql
+cd dist && mv sqlconvert-*.tar.bz2 ../.. && cd ../.. && exec rm -rf sqlconvert

diff --git a/publish-docs b/publish-docs
index e4d45a84468c2a0b6e0e8217d71d77c3e9b7f239..5b65ec75d0c771bc03284da4745e06121edc7a89 100755 (executable)
--- a/publish-docs
+++ b/publish-docs
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-web="$HOME"/Internet/WWW/htdocs/phdru.name/Software/Python/mysql2sql/docs
+web="$HOME"/Internet/WWW/htdocs/phdru.name/Software/Python/sqlconvert/docs
 
 cd "`dirname \"$0\"`"/docs/_build/html &&
 rsync -ahP --del * --exclude=objects.inv "$web" &&

diff --git a/scripts/mysql2sql b/scripts/mysql2sql
index 3809c1b29ea99675afb817ca98c97aa11e339dc8..d3178e9936219dc0b4d1acb7faf0c3ce27adfcb1 100755 (executable)
--- a/scripts/mysql2sql
+++ b/scripts/mysql2sql
@@ -7,8 +7,8 @@ import os
 import sys
 
 from sqlparse.compat import text_type
-from mysql2sql.print_tokens import print_tokens
-from mysql2sql.process_tokens import requote_names, StatementGrouper
+from sqlconvert.print_tokens import print_tokens
+from sqlconvert.process_tokens import requote_names, StatementGrouper
 
 from m_lib.defenc import default_encoding
 from m_lib.pbar.tty_pbar import ttyProgressBar

diff --git a/setup.py b/setup.py
index b71c2675a4babb72551acce9348b840fc96dd25f..e5911c88dbc2c4a972fbc1cf17b99c85b71ab4b6 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -15,14 +15,14 @@ except ImportError:
     from distutils.core import setup
     is_setuptools = False
 
-versionpath = join(abspath(dirname(__file__)), 'mysql2sql', '__version__.py')
-load_source('mysql2sql_version', versionpath)
+versionpath = join(abspath(dirname(__file__)), 'sqlconvert', '__version__.py')
+load_source('sqlconvert_version', versionpath)
 # Ignore: E402 module level import not at top of file
-from mysql2sql_version import __version__  # noqa
+from sqlconvert_version import __version__  # noqa
 
-setup(name='mysql2sql',
+setup(name='sqlconvert',
       version=__version__,
-      description='Broytman mysql2sql',
+      description='Broytman sqlconvert',
       long_description=open('README.txt', 'rtU').read(),
       author='Oleg Broytman',
       author_email='phd@phdru.name',
@@ -42,8 +42,8 @@ setup(name='mysql2sql',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
       ],
-      packages=['mysql2sql'],
+      packages=['sqlconvert'],
       package_data={},
-      scripts=['scripts/mysql2sql'],
+      scripts=['scripts/sqlconvert'],
       requires=['sqlparse', 'm_lib'],
       )

diff --git a/mysql2sql/__init__.py b/sqlconvert/__init__.py
similarity index 100%
rename from mysql2sql/__init__.py
rename to sqlconvert/__init__.py

diff --git a/mysql2sql/__version__.py b/sqlconvert/__version__.py
similarity index 100%
rename from mysql2sql/__version__.py
rename to sqlconvert/__version__.py

diff --git a/mysql2sql/print_tokens.py b/sqlconvert/print_tokens.py
similarity index 100%
rename from mysql2sql/print_tokens.py
rename to sqlconvert/print_tokens.py

diff --git a/mysql2sql/process_tokens.py b/sqlconvert/process_tokens.py
similarity index 100%
rename from mysql2sql/process_tokens.py
rename to sqlconvert/process_tokens.py

diff --git a/tests/test_stgrouper.py b/tests/test_stgrouper.py
index d77773e10e913a46c728dfecde680c14c5c2f603..3354b02e1ab2948530d00cd5db0d14e40721553c 100755 (executable)
--- a/tests/test_stgrouper.py
+++ b/tests/test_stgrouper.py
@@ -3,8 +3,8 @@
 
 import unittest
 
-from mysql2sql.print_tokens import tlist2str
-from mysql2sql.process_tokens import requote_names, StatementGrouper
+from sqlconvert.print_tokens import tlist2str
+from sqlconvert.process_tokens import requote_names, StatementGrouper
 from tests import main
 
 

diff --git a/tests/test_tokens.py b/tests/test_tokens.py
index e7e6b3fb5677ca3a5253ae83b2b1553a8ec94013..da62e43293938814d983e9e444d7a49995a9756c 100755 (executable)
--- a/tests/test_tokens.py
+++ b/tests/test_tokens.py
@@ -4,8 +4,8 @@
 import unittest
 from sqlparse import parse
 
-from mysql2sql.process_tokens import requote_names
-from mysql2sql.print_tokens import tlist2str
+from sqlconvert.process_tokens import requote_names
+from sqlconvert.print_tokens import tlist2str
 from tests import main