From f892ad9cfd34fcce07ca332b2b7642f212765841 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 24 Sep 2024 12:51:25 -0500 Subject: [PATCH] Rename the base SQL form classes to reflect their "base" character --- src/pgwui_sql/views/base.py | 8 ++++---- src/pgwui_sql/views/search_path_base.py | 6 +++--- src/pgwui_sql/views/sql.py | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pgwui_sql/views/base.py b/src/pgwui_sql/views/base.py index 7878ab0..97197bc 100644 --- a/src/pgwui_sql/views/base.py +++ b/src/pgwui_sql/views/base.py @@ -35,7 +35,7 @@ from pgwui_sql.constants import ( @attrs.define(slots=False) -class SQLInitialPost(pgwui_core.forms.UserInitialPost): +class SQLBaseInitialPost(pgwui_core.forms.UserInitialPost): sql = attrs.field(default='') upload_sql = attrs.field(default=False) sql_file = attrs.field(default=None) @@ -46,7 +46,7 @@ class SQLInitialPost(pgwui_core.forms.UserInitialPost): include_sql = attrs.field(default=True) -class SQLWTForm(pgwui_core.forms.AuthWTForm): +class SQLBaseWTForm(pgwui_core.forms.AuthWTForm): '''The wtform used to connect to the db to execute SQL.''' # We don't actually use the labels, wanting the template to # look (and render) like html, but I'll define them anyway @@ -77,8 +77,8 @@ class SQLWTForm(pgwui_core.forms.AuthWTForm): @attrs.define(slots=False) -class SQLForm(pgwui_core.forms.UploadFormBaseMixin, - pgwui_core.forms.AuthLoadedForm): +class SQLBaseForm(pgwui_core.forms.UploadFormBaseMixin, + pgwui_core.forms.AuthLoadedForm): ''' Acts like a dict, but with extra methods. diff --git a/src/pgwui_sql/views/search_path_base.py b/src/pgwui_sql/views/search_path_base.py index 00cc0c3..27691c8 100644 --- a/src/pgwui_sql/views/search_path_base.py +++ b/src/pgwui_sql/views/search_path_base.py @@ -30,7 +30,7 @@ from pgwui_core.constants import ( @attrs.define(slots=False) -class SQLEditForm(pgwui_sql.views.base.SQLForm): +class SQLEditForm(pgwui_sql.views.base.SQLBaseForm): '''Always set the "action" so that the SQL gets executed ''' def read(self): @@ -72,8 +72,8 @@ class SQLEditHandler(pgwui_core.core.SessionDBHandler): ''' def make_form(self): return SQLEditForm().build( - self, ip=pgwui_sql.views.base.SQLInitialPost(), - fc=pgwui_sql.views.base.SQLWTForm) + self, ip=pgwui_sql.views.base.SQLBaseInitialPost(), + fc=pgwui_sql.views.base.SQLBaseWTForm) def get_data(self): ''' diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py index 7f85624..0838f19 100644 --- a/src/pgwui_sql/views/sql.py +++ b/src/pgwui_sql/views/sql.py @@ -78,7 +78,7 @@ class SQLResultsHandler(pgwui_core.core.SessionDBHandler): Attributes: request A pyramid request instance - uf A SQLForm instance + uf A SQLBaseForm instance session A pyramid session instance ue cur @@ -89,9 +89,9 @@ class SQLResultsHandler(pgwui_core.core.SessionDBHandler): tfile = attrs.field(default=None) def make_form(self): - return pgwui_sql.views.base.SQLForm().build( - self, ip=pgwui_sql.views.base.SQLInitialPost(), - fc=pgwui_sql.views.base.SQLWTForm) + return pgwui_sql.views.base.SQLBaseForm().build( + self, ip=pgwui_sql.views.base.SQLBaseInitialPost(), + fc=pgwui_sql.views.base.SQLBaseWTForm) def read(self): super().read() -- 2.34.1