Update to SQL Parser 4.1.9

[php-sqllint.git] / README.rst

diff --git a/README.rst b/README.rst
index bca5a30c607df3c552f020b9569f31237fb987c8..69b6046f854ae87b309906baf8baab756573c727 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -6,12 +6,15 @@ Command line tool to validate (syntax check) SQL files.
 Primarily for MySQL ``.sql`` files.
 
 Can be used in git pre-commit hooks to catch errors.
+Use it from your shell, offline and without any SQL server.
+
+You can also use it to format SQL queries.
 
 
 =====
 Usage
 =====
-::
+Syntax check::
 
     $ php-sqllint tests/files/create-missingcomma.sql 
     Checking SQL syntax of tests/files/create-missingcomma.sql
@@ -27,25 +30,66 @@ Emacs mode::
     tests/files/create-noname.sql:1.13:Error: At least one column definition was expected.
 
 
+Formatting::
+
+    $ php-sqllint --format tests/files/select-unformatted.sql
+    SELECT
+      id,
+      NAME,
+      url
+    FROM
+      users
+    WHERE
+      DATE > NOW() AND id != 0
+    ORDER BY NAME
+    LIMIT 10
+
+
+Syntax highlighting
+===================
+ANSI colors are applied automatically when not piping; you can use the
+``--highlight`` option to override the automatism.
+
+``--highlight`` option values:
+
+``none``
+  No highlighting. Use it to disable automatic highlighting
+``ansi``
+  ANSI escape codes for your shell
+``html``
+  HTML tags
+
+
 ====
 Bugs
 ====
 Does ``php-sqllint`` not detect a syntax error, or doesn't support a certain
 SQL statement?
-Then please report a bug at `udan11/sql-parser`__.
+Then please report a bug at `phpmyadmin/sql-parser`__.
 
-__ https://github.com/udan11/sql-parser
+__ https://github.com/phpmyadmin/sql-parser
+
+
+========
+Download
+========
+The download files are equipped with all dependencies.
+Just download and run.
+
+.. LATESTRELEASE
+
+See `php-sqllint downloads page <http://cweiske.de/php-sqllint-download.htm>`_
+for all released versions.
 
 
 ============
 Dependencies
 ============
 - PEAR's `Console_Commandline`__
-- `udan11's SqlParser`__, which is used by `phpMyAdmin`__
+- `phpMyAdmin's SqlParser`__
 
 __ http://pear.php.net/package/Console_CommandLine
-__ https://github.com/udan11/sql-parser
-__ https://www.phpmyadmin.net/
+__ https://github.com/phpmyadmin/sql-parser
 
 
 Dependency installation
@@ -60,6 +104,14 @@ Now you can use ``./bin/php-sqllint`` without building the phar yourself.
 ========
 Building
 ========
+
+Preparation
+===========
+1. Write new version number into ``VERSION``
+
+
+Create the release
+==================
 You'll need `phing`__, the PHP build tool::
 
     $ phing
@@ -96,4 +148,6 @@ Source code
 
 Author
 ======
-Written by Christian Weiske, cweiske@cweiske.de
+Written by `Christian Weiske`__, cweiske+php-sqllint@cweiske.de
+
+__ http://cweiske.de/