Merge pull request #939 from circulon/feature/2.0_to_3.0

Transition 2.0 to 3.0

Author: josephmancuso

.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)