WIP

Author: josephmancuso

orm.sqlite3

@@ -89,6 +89,9 @@ def on(self, connection_key):
         """
         DB = load_config(config_path=self.config_path).DB
 
+        if not self.connection_details:
+            self.connection_details = DB.get_connection_details()
+
         if connection_key == "default":
             self.connection = self.connection_details.get("default")
 

src/masoniteorm/schema/Schema.py

@@ -575,6 +575,8 @@ def __init__(self, code):
                 self.code = code
 
             def __eq__(self, other):
+                if isinstance(other, dict):
+                    return self.code == other["code"]
                 return self.code == other.code
 
             def to_dict(self):

tests/collection/test_collection.py

@@ -3,6 +3,7 @@
 from src.masoniteorm.models import Model
 from src.masoniteorm.query import QueryBuilder
 from src.masoniteorm.query.grammars import PostgresGrammar
+from tests.utils import MockConnectionFactory
 
 
 class MockConnection:

tests/postgres/builder/test_postgres_query_builder.py

@@ -21,7 +21,7 @@ class Articles(Model):
     __timestamps__ = None
     __dates__ = ["published_date"]
 
-    @belongs_to("id", "article_id")
+    @has_one("id", "article_id")
     def logo(self):
         return Logo
 
@@ -104,12 +104,27 @@ def test_can_access_has_many_relationship(self):
         self.assertEqual(len(user.articles), 1)
 
     def test_can_access_relationship_multiple_times(self):
+        User.create(
+            {"name": "Joe", "is_admin": True, "email": "[email protected]"}
+        )
         user = User.hydrate(User.where("id", 1).first())
-        self.assertEqual(len(user.articles), 1)
-        self.assertEqual(len(user.articles), 1)
+        Articles.create({"title": "test", "user_id": user.id})
+        self.assertEqual(len(user.articles), 2)
+        self.assertEqual(len(user.articles), 2)
 
     def test_can_access_relationship_date(self):
+        User.create(
+            {"name": "Joe", "is_admin": True, "email": "[email protected]"}
+        )
+        article = Articles.create({"title": "test", "user_id": 1})
         user = User.with_("articles").where("id", 1).first()
+        Logo.create(
+            {
+                "name": "https://masonite.com",
+                "article_id": article.id,
+                "user_id": user.id,
+            }
+        )
         for article in user.articles:
             print(article.logo.published_date.is_past())
 
@@ -128,7 +143,7 @@ def test_loading_with_nested_with(self):
         for user in users:
             for article in user.articles:
                 if article.logo:
-                    print("aa", article.logo.url)
+                    print("aa", article.logo.name)
 
     def test_casting(self):
         users = User.with_("articles").where("is_admin", True).get()
@@ -143,6 +158,9 @@ def test_setting(self):
             user.save()
 
     def test_related(self):
+        User.create(
+            {"name": "Joe", "is_admin": True, "email": "[email protected]"}
+        )
         user = User.first()
         related_query = user.related("profile").where("active", 1).to_sql()
         self.assertEqual(

tests/sqlite/relationships/test_sqlite_relationships.py

@@ -1,30 +1,34 @@
 import unittest
 
-from src.masoniteorm.schema import Schema
+from src.masoniteorm.schema import Schema, Table
 from src.masoniteorm.schema.platforms import SQLitePlatform
+from tests.integrations.config.database import DATABASES
 
 
 class TestSQLiteSchemaBuilderAlter(unittest.TestCase):
     maxDiff = None
 
     def setUp(self):
         self.schema = Schema(
-            connection="sqlite",
+            connection="dev",
             platform=SQLitePlatform,
             dry=True,
-        ).on("sqlite")
+        ).on("dev")
 
     def test_can_add_columns(self):
-        with self.schema.alter("users") as blueprint:
+        with self.schema.table("users") as blueprint:
             blueprint.string("name")
+            blueprint.string("external_type").default("external")
             blueprint.integer("age")
 
-        self.assertEqual(len(blueprint.table.added_columns), 2)
+        self.assertEqual(len(blueprint.table.added_columns), 3)
+        print(blueprint.to_sql())
         self.assertEqual(
             blueprint.to_sql(),
             [
-                "ALTER TABLE `users` ADD COLUMN `name` VARCHAR(255) NOT NULL",
-                "ALTER TABLE `users` ADD COLUMN `age` INT(11) NOT NULL",
+                'ALTER TABLE "users" ADD COLUMN "name" VARCHAR NOT NULL',
+                'ALTER TABLE "users" ADD COLUMN "external_type" VARCHAR NOT NULL DEFAULT \'external\'',
+                'ALTER TABLE "users" ADD COLUMN "age" INTEGER NOT NULL',
             ],
         )
 
@@ -116,7 +120,7 @@ def test_drop_add_and_change(self):
         self.assertEqual(
             blueprint.to_sql(),
             [
-                'ALTER TABLE "users" ADD COLUMN "name" VARCHAR',
+                'ALTER TABLE "users" ADD COLUMN "name" VARCHAR NOT NULL',
                 "CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users",
                 'DROP TABLE "users"',
                 'CREATE TABLE "users" ("age" INTEGER NOT NULL, "name" VARCHAR(255) NOT NULL)',
@@ -246,9 +250,8 @@ def test_can_add_column_after(self):
             blueprint.string("name").after("age")
 
         self.assertEqual(len(blueprint.table.added_columns), 1)
+        print(blueprint.to_sql())
         self.assertEqual(
             blueprint.to_sql(),
-            [
-                "ALTER TABLE `users` ADD `name` VARCHAR(255) NOT NULL AFTER `age`"
-            ],
+            ['ALTER TABLE "users" ADD COLUMN "name" VARCHAR NOT NULL'],
         )