sqla-fancy-core 1.0.1__tar.gz → 1.0.2__tar.gz

{sqla_fancy_core-1.0.1 → sqla_fancy_core-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqla-fancy-core
-Version: 1.0.1
+Version: 1.0.2
 Summary: SQLAlchemy core, but fancier
 Project-URL: Homepage, https://github.com/sayanarijit/sqla-fancy-core
 Author-email: Arijit Basu <sayanarijit@gmail.com>
@@ -47,13 +47,13 @@ SQLAlchemy core, but fancier.
 
 ```python
 import sqlalchemy as sa
+
 from sqla_fancy_core import TableFactory
 
 tf = TableFactory()
 
 # Define a table
 class Author:
-
     id = tf.auto_id()
     name = tf.string("name")
     created_at = tf.created_at()
@@ -97,39 +97,7 @@ with engine.connect() as conn:
         .values({Author.name: "John Doe"})
         .returning(Author.id)
     )
-    author = next(conn.execute(qry).mappings())
-    author_id = author[Author.id]
-    assert author_id == 1
-
-    # Insert book
-    qry = (
-        sa.insert(Book.Table)
-        .values({Book.title: "My Book", Book.author_id: author_id})
-        .returning(Book.id)
-    )
-    book = next(conn.execute(qry).mappings())
-    assert book[Book.id] == 1
-
-    # Query the data
-    qry = sa.select(Author.name, Book.title).join(
-        Book.Table,
-        Book.author_id == Author.id,
-    )
-    result = conn.execute(qry).fetchall()
-    assert result == [("John Doe", "My Book")], result
-
-# Create the tables
-engine = sa.create_engine("sqlite:///:memory:")
-tf.metadata.create_all(engine)
-
-with engine.connect() as conn:
-    # Insert author
-    qry = (
-        sa.insert(Author.Table)
-        .values({Author.name: "John Doe"})
-        .returning(Author.id)
-    )
-    author = next(conn.execute(qry).mappings())
+    author = conn.execute(qry).mappings().first()
     author_id = author[Author.id]
     assert author_id == 1
 
@@ -139,7 +107,7 @@ with engine.connect() as conn:
         .values({Book.title: "My Book", Book.author_id: author_id})
         .returning(Book.id)
     )
-    book = next(conn.execute(qry).mappings())
+    book = conn.execute(qry).mappings().first()
     assert book[Book.id] == 1
 
     # Query the data
@@ -147,7 +115,7 @@ with engine.connect() as conn:
         Book.Table,
         Book.author_id == Author.id,
     )
-    result = conn.execute(qry).fetchall()
+    result = conn.execute(qry).all()
     assert result == [("John Doe", "My Book")], result
 ```
 

{sqla_fancy_core-1.0.1 → sqla_fancy_core-1.0.2}/README.md

@@ -6,13 +6,13 @@ SQLAlchemy core, but fancier.
 
 ```python
 import sqlalchemy as sa
+
 from sqla_fancy_core import TableFactory
 
 tf = TableFactory()
 
 # Define a table
 class Author:
-
     id = tf.auto_id()
     name = tf.string("name")
     created_at = tf.created_at()
@@ -56,39 +56,7 @@ with engine.connect() as conn:
         .values({Author.name: "John Doe"})
         .returning(Author.id)
     )
-    author = next(conn.execute(qry).mappings())
-    author_id = author[Author.id]
-    assert author_id == 1
-
-    # Insert book
-    qry = (
-        sa.insert(Book.Table)
-        .values({Book.title: "My Book", Book.author_id: author_id})
-        .returning(Book.id)
-    )
-    book = next(conn.execute(qry).mappings())
-    assert book[Book.id] == 1
-
-    # Query the data
-    qry = sa.select(Author.name, Book.title).join(
-        Book.Table,
-        Book.author_id == Author.id,
-    )
-    result = conn.execute(qry).fetchall()
-    assert result == [("John Doe", "My Book")], result
-
-# Create the tables
-engine = sa.create_engine("sqlite:///:memory:")
-tf.metadata.create_all(engine)
-
-with engine.connect() as conn:
-    # Insert author
-    qry = (
-        sa.insert(Author.Table)
-        .values({Author.name: "John Doe"})
-        .returning(Author.id)
-    )
-    author = next(conn.execute(qry).mappings())
+    author = conn.execute(qry).mappings().first()
     author_id = author[Author.id]
     assert author_id == 1
 
@@ -98,7 +66,7 @@ with engine.connect() as conn:
         .values({Book.title: "My Book", Book.author_id: author_id})
         .returning(Book.id)
     )
-    book = next(conn.execute(qry).mappings())
+    book = conn.execute(qry).mappings().first()
     assert book[Book.id] == 1
 
     # Query the data
@@ -106,7 +74,7 @@ with engine.connect() as conn:
         Book.Table,
         Book.author_id == Author.id,
     )
-    result = conn.execute(qry).fetchall()
+    result = conn.execute(qry).all()
     assert result == [("John Doe", "My Book")], result
 ```
 

{sqla_fancy_core-1.0.1 → sqla_fancy_core-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = 'sqla-fancy-core'
-version = '1.0.1'
+version = '1.0.2'
 description = 'SQLAlchemy core, but fancier'
 readme = 'README.md'
 requires-python = ">=3.7"

{sqla_fancy_core-1.0.1 → sqla_fancy_core-1.0.2}/sqla_fancy_core/__init__.py

@@ -11,8 +11,9 @@ class TableFactory:
     def __init__(self, metadata: Optional[sa.MetaData] = None):
         """Initialize the factory with default values."""
         if metadata is None:
-            metadata = sa.MetaData()
-        self.metadata = metadata
+            self.metadata = sa.MetaData()
+        else:
+            self.metadata = metadata
         self.c = []
 
     def col(self, *args, **kwargs) -> sa.Column:

{sqla_fancy_core-1.0.1 → sqla_fancy_core-1.0.2}/tests/test_table_factory.py

@@ -50,7 +50,7 @@ def test_table_factory():
             .values({Author.name: "John Doe"})
             .returning(Author.id)
         )
-        author = next(conn.execute(qry).mappings())
+        author = conn.execute(qry).mappings().first()
         author_id = author[Author.id]
         assert author_id == 1
 
@@ -60,7 +60,7 @@ def test_table_factory():
             .values({Book.title: "My Book", Book.author_id: author_id})
             .returning(Book.id)
         )
-        book = next(conn.execute(qry).mappings())
+        book = conn.execute(qry).mappings().first()
         assert book[Book.id] == 1
 
         # Query the data
@@ -68,5 +68,5 @@ def test_table_factory():
             Book.Table,
             Book.author_id == Author.id,
         )
-        result = conn.execute(qry).fetchall()
+        result = conn.execute(qry).all()
         assert result == [("John Doe", "My Book")], result