@@ -358,7 +358,8 @@ def _print_table_help(self, table_name: str) -> None:
358
358
"""
359
359
help_query = (
360
360
f"select column_name, datatype, xtype, unit "
361
- # f", description " ## TODO: The column description renders output unmanageable
361
+ # TODO: The column description renders output unmanageable
362
+ # f", description "
362
363
f"from TAP_SCHEMA.columns "
363
364
f"where table_name = '{ table_name } '" )
364
365
available_cols = self .query_tap_service (help_query )
@@ -524,18 +525,18 @@ def query_surveys(
524
525
c = column_filters if column_filters else {}
525
526
kwargs = {** kwargs , ** c }
526
527
t = self ._query_on_allowed_values (table_name = EsoNames .phase3_table ,
527
- column_name = EsoNames .phase3_surveys_column ,
528
- allowed_values = surveys ,
529
- cone_ra = cone_ra ,
530
- cone_dec = cone_dec ,
531
- cone_radius = cone_radius ,
532
- columns = columns ,
533
- top = top ,
534
- count_only = count_only ,
535
- query_str_only = query_str_only ,
536
- print_help = help ,
537
- authenticated = authenticated ,
538
- ** kwargs )
528
+ column_name = EsoNames .phase3_surveys_column ,
529
+ allowed_values = surveys ,
530
+ cone_ra = cone_ra ,
531
+ cone_dec = cone_dec ,
532
+ cone_radius = cone_radius ,
533
+ columns = columns ,
534
+ top = top ,
535
+ count_only = count_only ,
536
+ query_str_only = query_str_only ,
537
+ print_help = help ,
538
+ authenticated = authenticated ,
539
+ ** kwargs )
539
540
t = reorder_columns (t , DEFAULT_LEAD_COLS_PHASE3 )
540
541
return t
541
542
@@ -619,18 +620,18 @@ def query_main(
619
620
c = column_filters if column_filters else {}
620
621
kwargs = {** kwargs , ** c }
621
622
t = self ._query_on_allowed_values (table_name = EsoNames .raw_table ,
622
- column_name = EsoNames .raw_instruments_column ,
623
- allowed_values = instruments ,
624
- cone_ra = cone_ra ,
625
- cone_dec = cone_dec ,
626
- cone_radius = cone_radius ,
627
- columns = columns ,
628
- top = top ,
629
- count_only = count_only ,
630
- query_str_only = query_str_only ,
631
- print_help = help ,
632
- authenticated = authenticated ,
633
- ** kwargs )
623
+ column_name = EsoNames .raw_instruments_column ,
624
+ allowed_values = instruments ,
625
+ cone_ra = cone_ra ,
626
+ cone_dec = cone_dec ,
627
+ cone_radius = cone_radius ,
628
+ columns = columns ,
629
+ top = top ,
630
+ count_only = count_only ,
631
+ query_str_only = query_str_only ,
632
+ print_help = help ,
633
+ authenticated = authenticated ,
634
+ ** kwargs )
634
635
t = reorder_columns (t , DEFAULT_LEAD_COLS_RAW )
635
636
return t
636
637
0 commit comments