Feature/relationships

.envrc

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

.github/workflows/pythonapp.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     services:
       postgres:
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -58,12 +58,12 @@ jobs:
           python orm migrate --connection mysql
           make test
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     name: Lint
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python 3.6
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.6
       - name: Install Flake8

.github/workflows/pythonpublish.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     services:
       postgres:
@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

.github/workflows/radon-analysis.yml

@@ -0,0 +1,66 @@
+name: Radon Analysis
+
+on:
+  pull_request:
+    paths:
+      - '**/*.py' # Only trigger for Python files
+
+jobs:
+  radon_analysis:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0 # Ensure full history is fetched for git diff to work properly
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Install Radon
+      run: pip install radon
+
+    - name: Get list of changed files
+      id: get_changed_files
+      run: |
+        CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} | grep '.py$' || true)
+        echo "Changed files: $CHANGED_FILES"
+        echo "CHANGED_FILES<<EOF" >> $GITHUB_ENV
+        echo "$CHANGED_FILES" >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
+
+    - name: Debug changed files
+      run: |
+        echo "Changed files from env: ${{ env.CHANGED_FILES }}"
+      shell: bash
+
+    - name: Run Radon analysis
+      id: radon_analysis 
+      run: |
+        if [ -z "${{ env.CHANGED_FILES }}" ]; then
+          echo "No Python files changed."
+          echo "RESULTS=None" >> $GITHUB_ENV
+        else
+          RESULTS=$(echo "${{ env.CHANGED_FILES }}" | xargs radon cc -s -n A || true)
+          echo "RESULTS<<EOF" >> $GITHUB_ENV
+          echo "$RESULTS" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+        fi
+
+    - name: Comment on PR
+      if: env.RESULTS != 'None'
+      uses: marocchino/sticky-pull-request-comment@v2
+      with:
+        header: Radon Complexity Analysis
+        message: |
+          **Radon Analysis Results:**
+          ```
+          ${{ env.RESULTS }}
+          ```
+
+    - name: Log if no Python files found
+      if: env.RESULTS == 'None'
+      run: echo "No Python files changed in this PR."

.gitignore

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

.tool-versions

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

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,8 +16,9 @@
 # print(builder.where("id", 1).or_where(lambda q: q.where('id', 2).or_where('id', 3)).get())
 
 class User(Model):
-    __connection__ = "sqlite"
+    __connection__ = "mysql"
     __table__ = "users"
+    __dates__ = ["verified_at"]
 
     @has_many("id", "user_id")
     def articles(self):
@@ -28,7 +29,9 @@ class Article(Model):
 
 # 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.first().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,25 @@
-init:
+init: .env .bootstrapped-pip
+
+.bootstrapped-pip: requirements.txt requirements.dev
+	pip install -r requirements.txt -r requirements.dev
+	touch .bootstrapped-pip
+
+.env:
 	cp .env-example .env
-	pip install -r requirements.txt
-	pip install .
-	# Create MySQL Database
-	# Create Postgres Database
-test:
+
+# 	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
-format:
-	black src/masoniteorm
-	black tests/
-	make lint
-sort:
-	isort tests
-	isort src/masoniteorm
+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

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

playground.py

@@ -0,0 +1,36 @@
+from src.masoniteorm.models import Model
+
+class User(Model):
+    __table__ = "tbl_users"
+    __primary_key__ = "user_id"
+
+    @property
+    def company(self):
+        return self.has_one(Company, "company_id", "company_id")
+
+class CreditCard(Model):
+    __table__ = "company_credit_cards"
+    __primary_key__ = "credit_card_id"
+
+    @property
+    def company(self):
+        return self.has_one(Company, "company_id", "company_id")
+
+class Company(Model):
+    __table__ = "tbl_companies"
+    __primary_key__ = "company_id"
+
+
+    @property
+    def cards(self):
+        return self.has_many(CreditCard, "company_id", "company_id")
+
+# Usage has one
+user = User.find(667)
+
+# fetches record on related company record
+for card in user.company.cards:
+    print(card.company.company_name)
+
+# user.company() part returns a query builder so we can fetch related queries on the fly
+print(user.company().limit(1).to_sql())  # Output: select * from tbl_companies where tbl_companies.company_id = 373849

pytest.ini

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

requirements.dev

@@ -0,0 +1,8 @@
+flake8==3.7.9
+black
+faker
+pytest
+pytest-cov
+pytest-env
+pymysql
+isort

requirements.txt

@@ -1,13 +1,6 @@
-flake8==3.7.9
-black==19.3b0
-faker
-pytest
-pytest-cov
-pymysql
-isort
 inflection==0.3.1
 psycopg2-binary
-python-dotenv==0.14.0
 pyodbc
-pendulum>=2.1,<2.2
-cleo>=0.8.0,<0.9
+pendulum>=2.1,<3.1
+cleo>=0.8.0,<0.9
+python-dotenv==0.14.0

setup.py

@@ -8,7 +8,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="2.18.1",
+    version="2.23.1",
     package_dir={"": "src"},
     description="The Official Masonite ORM",
     long_description=long_description,
@@ -30,7 +30,7 @@
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
         "inflection>=0.3,<0.6",
-        "pendulum>=2.1,<2.2",
+        "pendulum>=2.1,<3.1",
         "faker>=4.1.0,<14.0",
         "cleo>=0.8.0,<0.9",
     ],