@@ -73,7 +73,7 @@ def get_table_sql(ds: CoreDatasource, conf: DatasourceConf, db_version: str = ''
7373 AND c.relkind IN ('r', 'v', 'p', 'm')
7474 AND c.relname NOT LIKE 'pg_%'
7575 AND c.relname NOT LIKE 'sql_%'
76- ORDER BY c.relname \
76+ ORDER BY c.relname
7777 """ , conf .dbSchema
7878 elif equals_ignore_case (ds .type , "oracle" ):
7979 return """
@@ -154,11 +154,11 @@ def get_table_sql(ds: CoreDatasource, conf: DatasourceConf, db_version: str = ''
154154 pg_namespace n ON n.oid = c.relnamespace
155155 LEFT JOIN
156156 pg_description d ON d.objoid = c.oid AND d.objsubid = 0
157- WHERE n.nspname = '{0}'
157+ WHERE n.nspname = %s
158158 AND c.relkind IN ('r', 'v', 'p', 'm')
159- AND c.relname NOT LIKE 'pg_%'
160- AND c.relname NOT LIKE 'sql_%'
161- ORDER BY c.relname \
159+ AND c.relname NOT LIKE 'pg_%% '
160+ AND c.relname NOT LIKE 'sql_%% '
161+ ORDER BY c.relname
162162 """ , conf .dbSchema
163163 elif equals_ignore_case (ds .type , "es" ):
164164 return "" , None
@@ -212,7 +212,7 @@ def get_field_sql(ds: CoreDatasource, conf: DatasourceConf, table_name: str = No
212212 pg_catalog.pg_namespace n ON n.oid = c.relnamespace
213213 WHERE n.nspname = :param1
214214 AND a.attnum > 0
215- AND NOT a.attisdropped \
215+ AND NOT a.attisdropped
216216 """
217217 sql2 = " AND c.relname = :param2" if table_name is not None and table_name != "" else ""
218218 return sql1 + sql2 , conf .dbSchema , table_name
@@ -228,7 +228,7 @@ def get_field_sql(ds: CoreDatasource, conf: DatasourceConf, table_name: str = No
228228 pg_catalog.pg_namespace n ON n.oid = c.relnamespace
229229 WHERE n.nspname = %s
230230 AND a.attnum > 0
231- AND NOT a.attisdropped \
231+ AND NOT a.attisdropped
232232 """
233233 sql2 = " AND c.relname = %s" if table_name is not None and table_name != "" else ""
234234 return sql1 + sql2 , conf .dbSchema , table_name
@@ -308,11 +308,11 @@ def get_field_sql(ds: CoreDatasource, conf: DatasourceConf, table_name: str = No
308308 pg_catalog.pg_class c ON a.attrelid = c.oid
309309 JOIN
310310 pg_catalog.pg_namespace n ON n.oid = c.relnamespace
311- WHERE n.nspname = '{0}'
311+ WHERE n.nspname = %s
312312 AND a.attnum > 0
313- AND NOT a.attisdropped \
313+ AND NOT a.attisdropped
314314 """
315- sql2 = " AND c.relname = '{1}' " if table_name is not None and table_name != "" else ""
315+ sql2 = " AND c.relname = %s " if table_name is not None and table_name != "" else ""
316316 return sql1 + sql2 , conf .dbSchema , table_name
317317 elif equals_ignore_case (ds .type , "es" ):
318318 return "" , None , None
0 commit comments