fastapi-startkit 0.24.0__tar.gz → 0.25.0__tar.gz

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi-startkit
-Version: 0.24.0
+Version: 0.25.0
 Summary: Fastapi Starter kit components
 Author: Bedram Tamang
 Author-email: Bedram Tamang <tmgbedu@gmail.com>

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-startkit"
-version = "0.24.0"
+version = "0.25.0"
 description = "Fastapi Starter kit components"
 authors = [
     {name = "Bedram Tamang", email = "tmgbedu@gmail.com"}

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/Blueprint.py

@@ -743,7 +743,7 @@ class Blueprint:
         self._last_column = _columns
         return self
 
-    def to_sql(self):
+    async def to_sql(self):
         """Compiles the blueprint class into a sql statement.
 
         Returns:
@@ -754,13 +754,10 @@ class Blueprint:
         elif self._action == "create_table_if_not_exists":
             return self.platform().compile_create_sql(self.table, if_not_exists=True)
         else:
-            if not self._dry and self.table.from_table is None:
-                # get current table schema
-                table = self.platform().get_current_schema(
+            if self.table.from_table is None:
+                self.table.from_table = await self.platform().get_current_schema(
                     self.connection, self.table.name, schema=self.schema
                 )
-                self.table.from_table = table
-
             return self.platform().compile_alter_sql(self.table)
 
     def __enter__(self):
@@ -781,12 +778,11 @@ class Blueprint:
     async def __aenter__(self):
         return self
 
-    # TODO: review
     async def __aexit__(self, exc_type, exc_value, exc_traceback):
         if self._dry:
             return
 
-        sql = self.to_sql()
+        sql = await self.to_sql()
         if isinstance(sql, list):
             for q in sql:
                 await self.connection.statement(q, ())

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/platforms/MySQLPlatform.py

@@ -435,10 +435,10 @@ class MySQLPlatform(Platform):
     def compile_get_all_tables(self, database, schema=None):
         return f"SELECT table_name FROM information_schema.tables WHERE table_schema = '{database}'"
 
-    def get_current_schema(self, connection, table_name, schema=None):
+    async def get_current_schema(self, connection, table_name, schema=None):
         table = Table(table_name)
         sql = f"DESCRIBE {table_name}"
-        result = connection.query(sql, ())
+        result = await connection.select(sql, ())
         reversed_type_map = {v: k for k, v in self.type_map.items()}
 
         for column in result:

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/platforms/PostgresPlatform.py

@@ -492,7 +492,7 @@ class PostgresPlatform(Platform):
     def compile_get_all_tables(self, database=None, schema=None):
         return f"SELECT table_name FROM information_schema.tables WHERE table_schema = '{schema or 'public'}' AND table_catalog = '{database}' AND table_type = 'BASE TABLE'"
 
-    def get_current_schema(self, connection, table_name, schema=None):
+    async def get_current_schema(self, connection, table_name, schema=None):
         sql = self.table_information_string().format(
             table=table_name, schema=schema or "public"
         )
@@ -501,7 +501,7 @@ class PostgresPlatform(Platform):
         reversed_type_map.update(self.table_info_map)
         table = Table(table_name)
 
-        result = connection.query(sql, ())
+        result = await connection.select(sql, ())
         for column in result:
             column_type = reversed_type_map.get(column["data_type"].upper())
 

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/platforms/SQLitePlatform.py

@@ -367,13 +367,13 @@ class SQLitePlatform(Platform):
 
         return names
 
-    def get_current_schema(self, connection, table_name, schema=None):
+    async def get_current_schema(self, connection, table_name, schema=None):
         sql = f"PRAGMA table_info({table_name})"
 
         reversed_type_map = {v: k for k, v in self.type_map.items()}
         table = Table(table_name)
 
-        result = connection.query(sql, ())
+        result = await connection.select(sql, ())
         for column in result:
             column_type = self.get_column_type(
                 reversed_type_map, column["type"].upper()

{fastapi_startkit-0.24.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/schema.py

@@ -4,6 +4,48 @@ from fastapi_startkit.masoniteorm.schema.TableDiff import TableDiff
 
 
 class Schema:
+    _type_hints_map = {
+        "string": str,
+        "char": str,
+        "big_increments": int,
+        "integer": int,
+        "big_integer": int,
+        "tiny_integer": int,
+        "small_integer": int,
+        "medium_integer": int,
+        "integer_unsigned": int,
+        "big_integer_unsigned": int,
+        "tiny_integer_unsigned": int,
+        "small_integer_unsigned": int,
+        "medium_integer_unsigned": int,
+        "increments": int,
+        "uuid": str,
+        "binary": bytes,
+        "boolean": bool,
+        "decimal": float,
+        "double": float,
+        "enum": str,
+        "text": str,
+        "tiny_text": str,
+        "float": float,
+        "geometry": str,
+        "json": dict,
+        "jsonb": bytes,
+        "inet": str,
+        "cidr": str,
+        "macaddr": str,
+        "long_text": str,
+        "point": str,
+        "time": str,
+        "timestamp": str,
+        "date": str,
+        "year": str,
+        "datetime": str,
+        "tiny_increments": int,
+        "unsigned": int,
+        "unsigned_integer": int,
+    }
+
     def __init__(self, manager) -> None:
         self._manager = manager
         self._connection = None