Transition 2.0 to 3.0

.envrc

@@ -0,0 +1,2 @@
+use asdf
+layout python

.github/workflows/pythonapp.yml

@@ -40,7 +40,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          make init
+          make init-ci
       - name: Test with pytest
         env:
           POSTGRES_DATABASE_HOST: localhost
@@ -68,6 +68,6 @@ jobs:
           python-version: 3.12
       - name: Install Flake8
         run: |
-          pip install flake8==3.7.9
+          pip install flake8-pyproject
       - name: Lint
         run: make lint

.github/workflows/pythonpublish.yml

@@ -42,7 +42,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          make init
+          make init-ci
       - name: Test with Pytest and Publish to PYPI
         env:
           POSTGRES_DATABASE_HOST: localhost

.gitignore

@@ -1,4 +1,5 @@
 venv
+.direnv
 .python-version
 .vscode
 .pytest_*
@@ -15,4 +16,7 @@ htmlcov/*
 coverage.xml
 .coverage
 *.log
-build
+build
+/orm.sqlite3
+/.bootstrapped-pip
+/.ignore-pre-commit

.pre-commit-config.yaml

@@ -0,0 +1,32 @@
+repos:
+  - repo: https://github.com/pycqa/isort
+    rev: 6.0.1
+    hooks:
+      - id: isort
+        args: [--profile=black]
+        exclude: |
+            (?x)(
+                ^build|
+                ^conda
+            )
+
+  - repo: https://github.com/psf/black
+    rev: 25.1.0
+    hooks:
+      - id: black
+        exclude: |
+            (?x)(
+                ^build|
+                ^conda
+            )
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.1.2
+    hooks:
+      - id: flake8
+        additional_dependencies: [flake8-pyproject]
+        exclude: |
+            (?x)(
+                ^build|
+                ^conda
+            )

.tool-versions

@@ -0,0 +1 @@
+python 3.8.10

CHANGELOG.md

@@ -0,0 +1,53 @@
+# Change Log
+
+## [3.0.0] - 2025-03-30
+
+### Changed
+
+- Model `create` now always checks for cast values 
+- `pendulum` version upgrade
+
+#### Breaking Changes
+
+- Changed raw expressions placeholder from requiringing explicit quoring per grammar (like this '?') to automaic (like this ?)
+- Changed `update` and `delete` methods to return the affected rows instead of the model
+- Seeding depencies are now in a separate`[seeder]` extension
+- `Factory` class must now be imported from the sub-package `masoniteorm.factories`
+
+### Fixed
+
+ - Model `update` and `delete` not casting passed values
+
+
+## [2.24.0] - 2025-01-23
+
+### Added
+
+- allow override of model default selects
+
+## [2.23.2] - 2024-11-29
+
+## Added
+
+- Ability so specify default select criteria for Models
+- Add connection pooling to MySQL and Postgres
+- PostgresConnection supports SSL and TLS options
+
+## Fixed
+
+- `.on_null` and `.on_not_null` had to be last criteria
+- Find cannot use scopes
+- Fix `has_one_through` relationship not working
+- Tests parameter `query=True` should return query builder
+- Fix `has_many_through` relationship not working
+- Fixed nested relations
+
+## [2.23.1] - 2024-10-22
+
+Maintenance release 
+
+## [2.23.0] - 2024-10-19
+
+## Added
+
+- Updated tests

CONTRIBUTING.md

@@ -12,7 +12,7 @@ If you are interested in the project then it would be a great idea to read the "
 
 ## Issues
 
-Everything really should start with opening an issue or finding an issue. If you feel you have an idea for how the project can be improved, no matter how small, you should open an issue so we can have an open dicussion with the maintainers of the project.
+Everything really should start with opening an issue or finding an issue. If you feel you have an idea for how the project can be improved, no matter how small, you should open an issue so we can have an open discussion with the maintainers of the project.
 
 We can discuss in that issue the solution to the problem or feature you have. If we do not feel it fits within the project then we will close the issue. Feel free to open a new issue if new information comes up.
 

cc.py

@@ -16,19 +16,22 @@
 # print(builder.where("id", 1).or_where(lambda q: q.where('id', 2).or_where('id', 3)).get())
 
 class User(Model):
-    __connection__ = "sqlite"
+    __connection__ = "t"
     __table__ = "users"
+    __dates__ = ["verified_at"]
 
     @has_many("id", "user_id")
     def articles(self):
         return Article
-class Article(Model):
+class Company(Model):
     __connection__ = "sqlite"
 
 
 # user = User.create({"name": "phill", "email": "phill"})
 # print(inspect.isclass(User))
-print(User.find(1).with_("articles").first().serialize())
+user = User.first()
+# user.update({"verified_at": None, "updated_at": None})
+print(user.serialize())
 
 # print(user.serialize())
 # print(User.first())

config/test-database.py

@@ -0,0 +1,35 @@
+from src.masoniteorm.connections import ConnectionResolver
+
+DATABASES = {
+  "default": "mysql",
+  "mysql": {
+    "host": "127.0.0.1",
+    "driver": "mysql",
+    "database": "masonite",
+    "user": "root",
+    "password": "",
+    "port": 3306,
+    "log_queries": False,
+    "options": {
+      #
+    }
+  },
+  "postgres": {
+    "host": "127.0.0.1",
+    "driver": "postgres",
+    "database": "masonite",
+    "user": "root",
+    "password": "",
+    "port": 5432,
+    "log_queries": False,
+    "options": {
+      #
+    }
+  },
+  "sqlite": {
+    "driver": "sqlite",
+    "database": "masonite.sqlite3",
+  }
+}
+
+DB = ConnectionResolver().set_connection_details(DATABASES)

makefile

@@ -1,22 +1,36 @@
-init:
-	cp .env-example .env
+SHELL := /bin/bash
+
+init: .env .bootstrapped-pip .git/hooks/pre-commit
+init-ci:
+	touch .ignore-pre-commit
+	make init
+
+.bootstrapped-pip: requirements.txt
 	pip install -r requirements.txt
-	pip install .
-	# Create MySQL Database
-	# Create Postgres Database
-test:
+	touch .bootstrapped-pip
+
+.git/hooks/pre-commit:
+	@if ! test -e ".ignore-pre-commit"; then \
+  		pip install pre-commit; \
+  		pre-commit install --install-hooks; \
+	fi
+
+.env:
+	cp .env-example .env
+
+# 	Create MySQL Database
+# 	Create Postgres Database
+test: init
 	python -m pytest tests
 ci:
 	make test
+check: format sort lint
 lint:
-	python -m flake8 src/masoniteorm/ --ignore=E501,F401,E203,E128,E402,E731,F821,E712,W503,F811,E231,E702
-format:
-	black src/masoniteorm
-	black tests/
-	make lint
-sort:
-	isort tests
-	isort src/masoniteorm
+	flake8 src/masoniteorm tests
+format: init
+	black src/masoniteorm tests/
+sort: init
+	isort src/masoniteorm tests/
 coverage:
 	python -m pytest --cov-report term --cov-report xml --cov=src/masoniteorm tests/
 	python -m coveralls
@@ -37,4 +51,4 @@ pub:
 	rm -fr build dist .egg masonite.egg-info
 	rm -rf dist/*
 pypirc:
-	cp .pypirc ~/.pypirc
+	cp .pypirc ~/.pypirc

orm

@@ -10,6 +10,7 @@ from src.masoniteorm.commands import (
     MigrateCommand,
     MigrateRollbackCommand,
     MigrateRefreshCommand,
+    MigrateFreshCommand,
     MakeMigrationCommand,
     MakeObserverCommand,
     MakeModelCommand,
@@ -25,6 +26,7 @@ application = Application("ORM Version:", 0.1)
 application.add(MigrateCommand())
 application.add(MigrateRollbackCommand())
 application.add(MigrateRefreshCommand())
+application.add(MigrateFreshCommand())
 application.add(MakeMigrationCommand())
 application.add(MakeModelCommand())
 application.add(MakeModelDocstringCommand())

pyproject.toml

@@ -0,0 +1,21 @@
+[tool.black]
+target-version = ['py38']
+include = '\.pyi?$'
+line-length = 79
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+
+[tool.flake8]
+ignore = ['E501', 'E203', 'E128', 'E402', 'E731', 'F821', 'E712', 'W503', 'F811']
+#max-line-length = 79
+#max-complexity = 18
+per-file-ignores = [
+    '__init__.py:F401',
+    'setup.py:E266',
+]

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+env = 
+    D:DB_CONFIG_PATH=config/test-database

requirements.txt

@@ -1,13 +1,13 @@
-flake8==3.7.9
-black==19.3b0
+flake8-pyproject
+black
+isort
 faker
 pytest
 pytest-cov
 pymysql
-isort
-inflection==0.3.1
+inflection>=0.3
 psycopg2-binary
-python-dotenv==0.14.0
+python-dotenv>=0.14
 pyodbc
 pendulum>=3.0,<4.0
-cleo>=0.8.0,<0.9
+cleo>=0.8.0,<2.0

setup.py

@@ -31,8 +31,7 @@
     install_requires=[
         "inflection>=0.3,<0.6",
         "pendulum>=3.0,<4.0",
-        "faker>=4.1.0,<14.0",
-        "cleo>=0.8.0,<0.9",
+        "cleo>=0.8.0,<2.0",
     ],
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
@@ -50,10 +49,12 @@
         "Operating System :: OS Independent",
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Framework :: Masonite",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Framework :: Masonite",
@@ -83,15 +84,15 @@
         "masoniteorm.schema.platforms",
         "masoniteorm.scopes",
         "masoniteorm.seeds",
-        "masoniteorm.testing",
     ],
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
     # for example:
     # $ pip install -e .[dev,test]
     # $ pip install your-package[dev,test]
     extras_require={
-        "test": ["coverage", "pytest"],
+        "test": ["coverage", "pytest", "faker"],
+        "seeder": ["faker"],
     },
     # If there are data files included in your packages that need to be
     # installed, specify them here.  If using Python 2.6 or less, then these

src/masoniteorm/__init__.py

@@ -1,2 +1 @@
 from .models import Model
-from .factories.Factory import Factory