dylanscott · Sep 27, 2023 · Aug 7, 2022 · Apr 29, 2022 · Aug 4, 2022 · Aug 7, 2022
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,7 @@
+# Be nice to each other
+
+Everyone participating in the _sqlparse_ project and especially in the
+issue tracker, discussion forums, pull requests, is expected to treat
+other people with respect and more generally to follow the guidelines 
+articulated in the 
+[Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/).
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug,needs-triage'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior. 
+Please give code examples or concete SQL statements. Take care of not posting any sensitive information when pasting SQL statements!
+What's the concrete error / traceback.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Versions (please complete the following information):**
+ - Python: [e.g. 3.11.2]
+ - sqlparse: [e.g. 0.4.1]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Discussions, Questions?
+    url: https://github.com/andialbrecht/sqlparse/discussions
+    about: Please ask questions and start more general discussions here
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+# Thanks for contributing!
+
+Before submitting your pull request please have a look at the
+following checklist:
+
+- [ ] ran the tests (`pytest`)
+- [ ] all style issues addressed (`flake8`)
+- [ ] your changes are covered by tests
+- [ ] your changes are documented, if needed
+
+In addition, please take care to provide a proper description
+on what your change does, fixes or achieves when submitting the 
+pull request.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,11 +39,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -5,38 +5,46 @@ name: Python application
 
 on:
   push:
-    branches: [ master ]
+    branches:
+    - master
   pull_request:
     branches: [ master ]
+  schedule:
+    - cron: '0 12 * * *'
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
+  test:
+    name: Run tests on ${{ matrix.py }}
+    runs-on: ubuntu-20.04  # keep it on 20.04 to have Python 3.6 available
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+        py:
+          - "3.12"
+          - "3.11"
+          - "3.10"
+          - "3.9"
+          - "3.8"
+          - "3.7"
+          - "3.6"
+          - "pypy-3.9"
+          - "pypy-3.8"
+          - "pypy-3.7"
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.py }}
+      uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ matrix.py }}
+        allow-prereleases: true
+        check-latest: true
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest pytest-cov codecov
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        python -m pip install --upgrade pip flit
+        flit install --deps=develop
     - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 sqlparse --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 sqlparse --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      run: flake8 sqlparse --count --max-complexity=31 --show-source --statistics
     - name: Test with pytest
-      run: |
-        pytest --cov=sqlparse
+      run: pytest --cov=sqlparse
     - name: Publish to codecov
-      run: |
-        codecov
+      uses: codecov/codecov-action@v3
diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,7 @@ project: https://bitbucket.org/gutworth/six.
 
 Alphabetical list of contributors:
 * Adam Greenhall <agreenhall@lyft.com>
+* Aki Ariga <chezou+github@gmail.com>
 * Alexander Beedie <ayembee@gmail.com>
 * Alexey Malyshev <nostrict@gmail.com>
 * ali-tny <aliteeney@googlemail.com>
@@ -16,20 +17,25 @@ Alphabetical list of contributors:
 * atronah <atronah.ds@gmail.com>
 * casey <casey@cloudera.com>
 * Cauê Beloni <cbeloni@gmail.com>
+* Christian Clauss <cclauss@me.com>
 * circld <circld1@gmail.com>
 * Corey Zumar <corey.zumar@databricks.com>
 * Cristian Orellana <cristiano@groupon.com>
 * Dag Wieers <dag@wieers.com>
+* Daniel Harding <dharding@living180.net>
 * Darik Gamble <darik.gamble@gmail.com>
 * Demetrio92 <Demetrio.Rodriguez.T@gmail.com>
 * Dennis Taylor <dennis.taylor@clio.com>
 * Dvořák Václav <Vaclav.Dvorak@ysoft.com>
+* Erik Cederstrand <erik@adamatics.com>
 * Florian Bauer <florian.bauer@zmdi.com>
 * Fredy Wijaya <fredy.wijaya@gmail.com>
 * Gavin Wahl <gwahl@fusionbox.com>
+* Hugo van Kemenade <hugovk@users.noreply.github.com>
 * hurcy <cinyoung.hur@gmail.com>
 * Ian Robertson <ian.robertson@capitalone.com>
 * JacekPliszka <Jacek.Pliszka@gmail.com>
+* JavierPan <PeterSandwich@users.noreply.github.com>
 * Jean-Martin Archer <jm@jmartin.ca>
 * Jesús Leganés Combarro "Piranna" <piranna@gmail.com>
 * Johannes Hoff <johshoff@gmail.com>
@@ -39,11 +45,13 @@ Alphabetical list of contributors:
 * Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
 * koljonen <koljonen@outlook.com>
 * Likai Liu <liulk@likai.org>
+* Long Le Xich <codenamelxl@users.noreply.github.com>
 * mathilde.oustlant <mathilde.oustlant@ext.cdiscount.com>
 * Michael Schuller <chick@mschuller.net>
 * Mike Amy <cocoade@googlemail.com>
 * mulos <daniel.strackbein@gmail.com>
 * Oleg Broytman <phd@phdru.name>
+* osmnv <80402144+osmnv@users.noreply.github.com>
 * Patrick Schemitz <patrick.schemitz@digitalbriefkasten.de>
 * Pi Delport <pjdelport@gmail.com>
 * Prudhvi Vatala <pvatala@gmail.com>
@@ -55,6 +63,7 @@ Alphabetical list of contributors:
 * Ryan Wooden <rygwdn@gmail.com>
 * saaj <id@saaj.me>
 * Shen Longxing <shenlongxing2012@gmail.com>
+* Simon Heisterkamp <she@delegate.dk>
 * Sjoerd Job Postmus
 * Soloman Weng <soloman1124@gmail.com>
 * spigwitmer <itgpmc@gmail.com>

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,64 @@
 Development Version
 -------------------
 
-Nothing yet.
+Notable Changes
+
+* Drop support for Python 3.5.
+* Python 3.12 is now supported (pr725, by hugovk).
+
+Bug Fixes
+
+* Ignore dunder attributes when creating Tokens (issue672).
+
+
+Release 0.4.4 (Apr 18, 2023)
+----------------------------
+
+Notable Changes
+
+* IMPORTANT: This release fixes a security vulnerability in the
+  parser where a regular expression vulnerable to ReDOS (Regular
+  Expression Denial of Service) was used. See the security advisory
+  for details: https://github.com/andialbrecht/sqlparse/security/advisories/GHSA-rrm6-wvj7-cwh2
+  The vulnerability was discovered by @erik-krogh from GitHub
+  Security Lab (GHSL). Thanks for reporting!
+
+Bug Fixes
+
+* Revert a change from 0.4.0 that changed IN to be a comparison (issue694).
+  The primary expectation is that IN is treated as a keyword and not as a
+  comparison operator. That also follows the definition of reserved keywords
+  for the major SQL syntax definitions.
+* Fix regular expressions for string parsing.
+
+Other
+
+* sqlparse now uses pyproject.toml instead of setup.cfg (issue685).
+
+
+Release 0.4.3 (Sep 23, 2022)
+----------------------------
+
+Enhancements
+
+* Add support for DIV operator (pr664, by chezou).
+* Add support for additional SPARK keywords (pr643, by mrmasterplan).
+* Avoid tokens copy (pr622, by living180).
+* Add REGEXP as a comparision (pr647, by PeterSandwich).
+* Add DISTINCTROW keyword for MS Access (issue677).
+* Improve parsing of CREATE TABLE AS SELECT (pr662, by chezou).
+
+Bug Fixes
+
+* Fix spelling of INDICATOR keyword (pr653, by ptld).
+* Fix formatting error in EXTRACT function (issue562, issue670, pr676, by ecederstrand).
+* Fix bad parsing of create table statements that use lower case (issue217, pr642, by mrmasterplan).
+* Handle backtick as valid quote char (issue628, pr629, by codenamelxl).
+* Allow any unicode character as valid identifier name (issue641).
+
+Other
+
+* Update github actions to test on Python 3.10 as well (pr661, by cclaus).
 
 
 Release 0.4.2 (Sep 10, 2021)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,11 @@
+# Contributing to `sqlparse`
+
+Thanks for your interest in contributing to the `sqlparse` project!
+
+All contributors are expected to follow the 
+[Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/).
+
+Head over to the 
+[Discussions Page](https://github.com/andialbrecht/sqlparse/discussions) if
+you have any questions. We're still working on a more elaborate 
+developer guide.
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/Makefile b/Makefile
@@ -22,5 +22,6 @@ clean:
 
 release:
 	@rm -rf dist/
-	python setup.py sdist bdist_wheel
+	python -m build
 	twine upload --sign --identity E0B84F81 dist/*
+	@echo "Reminder: Add release on github https://github.com/andialbrecht/sqlparse/releases"
diff --git a/README.rst b/README.rst
@@ -4,13 +4,14 @@ python-sqlparse - Parse SQL statements
 |buildstatus|_
 |coverage|_
 |docs|_
+|packageversion|_
 
 .. docincludebegin
 
 sqlparse is a non-validating SQL parser for Python.
 It provides support for parsing, splitting and formatting SQL statements.
 
-The module is compatible with Python 3.5+ and released under the terms of the
+The module is compatible with Python 3.6+ and released under the terms of the
 `New BSD license <https://opensource.org/licenses/BSD-3-Clause>`_.
 
 Visit the project page at https://github.com/andialbrecht/sqlparse for
@@ -59,7 +60,7 @@ Documentation
    https://sqlparse.readthedocs.io/
 
 Online Demo
-  https://sqlformat.org/
+   https://sqlformat.org/
 
 
 sqlparse is licensed under the BSD license.
@@ -73,3 +74,5 @@ pygments-Homepage: http://pygments.org/
 .. _coverage: https://codecov.io/gh/andialbrecht/sqlparse
 .. |docs| image:: https://readthedocs.org/projects/sqlparse/badge/?version=latest
 .. _docs: https://sqlparse.readthedocs.io/en/latest/?badge=latest
+.. |packageversion| image:: https://img.shields.io/pypi/v/sqlparse?color=%2334D058&label=pypi%20package
+.. _packageversion: https://pypi.org/project/sqlparse
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+For now `sqlparse` uses very defensive version numbers. There's no major version yet. 
+In turn there's only one supported version and this is the latest.
+
+## Reporting a Vulnerability
+
+To report a vulnerability head over to the [Security Advisories](https://github.com/andialbrecht/sqlparse/security/advisories) 
+page and click on "New draft security advisory".
+
+Feel free to contact me at albrecht.andi@gmail.com if you have any questions or want to discuss things
+beforehand.