update with upstream

.github/workflows/run_test.yaml

@@ -0,0 +1,35 @@
+name: master-test
+
+on:
+  push:
+    branches:
+    - master
+    - ombott-dev
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Everything
+        run: |
+            sudo apt-get install memcached libmemcached-tools
+            python -m pip install --upgrade pip
+            ls -l
+            python -m pip install -e ./
+            python -m pip install -r test-requirements.txt
+      - name: Test
+        run: |
+            python -m unittest tests

.gitignore

@@ -13,6 +13,8 @@
 Thumbs.db
 .DS_Store
 pyDAL.egg-info/*
+venv/*
+test-venv/*
 dist/*
 build/*
 .project

CHANGES

@@ -2,6 +2,7 @@ pyDAL changelog
 ===============
 
 Version 18.0
+------------
 
 Released on December 27th 2019
 

MANIFEST.in

@@ -1,4 +1,4 @@
-include LICENSE
+include LICENSE.txt
 include AUTHORS
 include CHANGES
 recursive-include tests *

Makefile

@@ -1,15 +1,15 @@
-.PHONY: clean build install deploy test.sql
+.PHONY: uv ruff test lock build deploy
 
-clean:
-	rm dist/* || echo ''
-	python3 setup.py clean
-build: clean
-	python3 setup.py build
-install: build
-	python3 setup.py install
-test.sql: install
-	python3 -m unittest tests.sql
-deploy: build
-	#http://guide.python-distribute.org/creation.html
-	python3 setup.py sdist
-	twine upload dist/*
+uv:
+	which uv || curl -LsSf https://astral.sh/uv/install.sh | sh
+check: uv
+	uv tool run ruff check
+format: uv
+	uv tool run ruff format
+test: check
+	uv run --extra test -m unittest tests
+build: test
+	rm -rf dist/* build/*
+	uv build
+publish: build
+	uv run --extra manage python -m twine upload dist/*

README.md

@@ -1,16 +1,16 @@
 # pyDAL
 
+[![pip version](https://img.shields.io/pypi/v/pydal.svg?style=flat-square)](https://pypi.python.org/pypi/pydal)
+[![master-test](https://github.com/web2py/pydal/actions/workflows/run_test.yaml/badge.svg)](https://github.com/web2py/pydal/actions/workflows/run_test.yaml)
+[![Coverage Status](https://img.shields.io/codecov/c/github/web2py/pydal.svg?style=flat-square)](https://codecov.io/github/web2py/pydal)
+[![API Docs Status](https://readthedocs.org/projects/pydal/badge/?version=latest&style=flat-square)](http://pydal.rtfd.org/)
+
 pyDAL is a pure Python Database Abstraction Layer.
 
 It dynamically generates the SQL/noSQL in realtime using the specified dialect for the database backend, so that you do not have to write SQL code or learn different SQL dialects (the term SQL is used generically), and your code will be portable among different types of databases.
+What makes pyDAL different from most of the other DALs is the syntax: it maps records to python dictionaries, which is simpler and closer to SQL. Other famous frameworks instead strictly rely on an Object Relational Mapping (ORM) like the Django ORM or the SQL Alchemy ORM, that maps tables to Python classes and rows to Objects.
 
-pyDAL comes from the original web2py's DAL, with the aim of being compatible with any Python program. pyDAL doesn't require web2py and can be used in any Python context.
-
-[![pip version](https://img.shields.io/pypi/v/pydal.svg?style=flat-square)](https://pypi.python.org/pypi/pydal)
-[![Build Status](https://img.shields.io/travis/web2py/pydal/master.svg?style=flat-square&label=Travis-CI)](https://travis-ci.org/web2py/pydal)
-[![MS Build Status](https://img.shields.io/appveyor/ci/web2py/pydal/master.svg?style=flat-square&label=Appveyor-CI)](https://ci.appveyor.com/project/web2py/pydal)
-[![Coverage Status](https://img.shields.io/codecov/c/github/web2py/pydal.svg?style=flat-square)](https://codecov.io/github/web2py/pydal)
-[![API Docs Status](https://readthedocs.org/projects/pydal/badge/?version=latest&style=flat-square)](http://pydal.rtfd.org/)
+Historically pyDAL comes from the original web2py's DAL, with the aim of being compatible with any Python program. However, pyDAL nowadays is an indipendent package that can be used in any Python 3.7+ context.
 
 ## Installation
 
@@ -36,7 +36,7 @@ Chair
 >>> db.commit()
 ```
 
-The complete documentation is available on http://www.web2py.com/books/default/chapter/29/06/the-database-abstraction-layer
+The complete updated documentation is available on [the py4web manual](https://py4web.com/_documentation/static/en/chapter-07.html)
 
 ## What's in the box?
 
@@ -67,6 +67,7 @@ pyDAL supports the following databases:
 * SAPDB
 * IMAP
 * MongoDB
+* Google Firestore
 
 ## License
 

appveyor.yml

@@ -1,26 +1,17 @@
 build: false
+image: Visual Studio 2019
 
 services:
-  - mssql2014
+  - mssql2019
 
 environment:
   matrix:
-    - PYTHON: "C:/Python27"
-      adapter: "mssql"
-    - PYTHON: "C:/Python27"
-      adapter: "mssqln"
-    - PYTHON: "C:/Python34"
-      adapter: "mssql"
-    - PYTHON: "C:/Python34"
-      adapter: "mssqln"
-    - PYTHON: "C:/Python35"
-      adapter: "mssql"
-    - PYTHON: "C:/Python35"
-      adapter: "mssqln"
-    - PYTHON: "C:/Python36-x64"
+    - PYTHON: "C:/Python38-x64"
+      PY_VER: "3.8"
       PYTHON_ARCH: "64"
       adapter: "mssql"
-    - PYTHON: "C:/Python36-x64"
+    - PYTHON: "C:/Python38-x64"
+      PY_VER: "3.8"
       PYTHON_ARCH: "64"
       adapter: "mssqln"
 
@@ -29,23 +20,26 @@ clone_depth: 50
 init:
   - "ECHO %PYTHON%"
   - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+  - powershell -Command "Get-Service | Where-Object { $_.DisplayName -like '*SQL*' }"
+  - ps: Start-Service -Name 'MSSQL$SQL2019' -ErrorAction SilentlyContinue
+
 
 install:
-  - ps: Start-FileDownload https://bootstrap.pypa.io/get-pip.py
+  - appveyor DownloadFile https://bootstrap.pypa.io/pip/get-pip.py
   - python get-pip.py
-  - pip install tox==1.9.2
+  - pip install tox==4.23.2
   - pip install codecov
 
 before_test:
   - ps: |
         while($LASTEXITCODE -ne 0)
         {
-          & sqlcmd -S "(local)\SQL2014" -b -U "sa" -P "Password12!" -Q "CREATE DATABASE pydal COLLATE Latin1_General_CS_AS;" -d "master"
+          & sqlcmd -S "(local)" -U "sa" -P "Password12!" -Q "CREATE DATABASE pydal COLLATE Latin1_General_CS_AS;" -d "master"
           sleep 10; $val++; Write-Host Waiting ... $val; if($val -ge 10) {break}
         }
 
 test_script:
   - tox -e coverage-%adapter%
 
 after_test:
-  - codecov
+  - codecov

docs/conf.py

@@ -11,7 +11,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os, shutil
+import os
+import shutil
+import sys
 
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
@@ -56,8 +58,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"pyDAL"
-copyright = u"2014, web2py-developers"
+project = "pyDAL"
+copyright = "2014, web2py-developers"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -188,7 +190,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "pydal.tex", u"pyDAL Documentation", u"web2py-developers", "manual"),
+    ("index", "pydal.tex", "pyDAL Documentation", "web2py-developers", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -216,7 +218,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "pyDAL", u"pyDAL Documentation", [u"web2py-developers"], 1)]
+man_pages = [("index", "pyDAL", "pyDAL Documentation", ["web2py-developers"], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -231,8 +233,8 @@
     (
         "index",
         "pyDAL",
-        u"pyDAL Documentation",
-        u"web2py-developers",
+        "pyDAL Documentation",
+        "web2py-developers",
         "pyDAL",
         "pyDAL",
         "Miscellaneous",

pydal/__init__.py

@@ -1,6 +1,7 @@
-__version__ = "20210215.1"
+__version__ = "20250922.1"
 
 from .base import DAL
-from .objects import Field
 from .helpers.classes import SQLCustomType
-from .helpers.methods import geoPoint, geoLine, geoPolygon
+from .helpers.methods import geoLine, geoPoint, geoPolygon
+from .objects import Field
+from .querybuilder import QueryBuilder