updated sqlalchemy to v2

Arfey · Apr 3, 2024 · ec086a9 · ec086a9
1 parent 1c414c7
commit ec086a9
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 235 deletions.
diff --git a/aiohttp_admin2/resources/postgres_resource/postgres_resource.py b/aiohttp_admin2/resources/postgres_resource/postgres_resource.py
@@ -166,14 +166,14 @@ async def get_list(
                     count: int = await self._execute_scalar(
                         conn,
                         self.apply_filters(
-                            query=sa.select([func.count(self._primary_key)]),
+                            query=sa.select(func.count(self._primary_key)).select_from(self.table),
                             filters=filters,
                         )
                     )
                 else:
                     count: int = await self._execute_scalar(
                         conn,
-                        sa.select([func.count(self._primary_key)])
+                        sa.select(func.count()).select_from(self.table)
                     )
                 return self.create_paginator(
                     instances=res,

diff --git a/example_projects/main/admin/users/controllers.py b/example_projects/main/admin/users/controllers.py
@@ -22,11 +22,11 @@ def get_list_select(self) -> sa.sql.Select:
         """
         In this place you can redefine query.
         """
-        return sa.select([
+        return sa.select(
             *self.table.c,
             sa.type_coerce(sa.text("payload -> 'data'"), sa.Text)
                 .label('data')
-        ])
+        )
 
 
 @postgres_injector.inject
@@ -35,7 +35,7 @@ class UsersController(PostgresController, table=users):
     resource = UserPostgresResource
     name = 'users'
     per_page = 10
-    upload_to = './demo/main/static'
+    upload_to = './example_projects/main/static'
     inline_fields = ['id', 'create_at', 'is_superuser', 'array_c', 'data', ]
     list_filter = ['create_at', 'is_superuser', 'id']
 

diff --git a/example_projects/main/load_data.py b/example_projects/main/load_data.py
@@ -156,20 +156,20 @@ def recreate_tables(db_url):
 async def create_users(config):
     query = users.insert().values([
         {
-            "name": "admin",
+            "name": "Jake Gyllenhaal",
             "is_superuser": True,
             "create_at": datetime.datetime.now(),
             "create_at_date": datetime.datetime.today(),
             "payload": {},
-            "avatar": "https://bit.ly/2MZJnqt",
+            "avatar": "https://image.tmdb.org/t/p/w200//rJdYHYNhlcOBwbPvDZVvt1xw7bi.jpg",
         },
         {
-            "name": "user",
+            "name": "Dionne Wudu",
             "is_superuser": False,
             "create_at": datetime.datetime.now(),
             "create_at_date": datetime.datetime.today(),
             "payload": {},
-            "avatar": "https://bit.ly/2MZJnqt",
+            "avatar": "https://image.tmdb.org/t/p/w200//gSvoRh6lRnLM0FduX3sIciTIj17.jpg",
         },
     ])