Commit 93dc929d authored by Laura, Jason R's avatar Laura, Jason R
Browse files

Merge branch 'main' into 'main' 

Fixes SQL formatting issue

See merge request astrogeology/autocnet!684
parents a84b11d8 c4d59a9f

CHANGELOG.md

+3 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,9 @@ release. 
- Ability to place points in centroids instead of overlaps.

- Ability to place points in centroids instead of overlaps.

- Ability to find points in centroids focused around a plantary body

- Ability to find points in centroids focused around a plantary body





### Fixed

- string injection via format with sqlalchemy text() object.



## [1.0.2]

## [1.0.2]

### Fixed

### Fixed

- API updates for numpy changing types and SQLAlchemy2.0.

- API updates for numpy changing types and SQLAlchemy2.0.

autocnet/sql.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -26,11 +26,11 @@ select_ten_pub_image = text('SELECT * FROM public.images LIMIT 10') 




select_pub_image = text('SELECT * FROM public.images')

select_pub_image = text('SELECT * FROM public.images')





from_database_composite = text('''WITH i as ({formatInput}) SELECT i1.id

from_database_composite = '''WITH i as ({formatInput}) SELECT i1.id

        as i1_id,i1.path as i1_path, i2.id as i2_id, i2.path as i2_path

        as i1_id,i1.path as i1_path, i2.id as i2_id, i2.path as i2_path

        FROM i  as i1, i as i2

        FROM i  as i1, i as i2

        WHERE ST_INTERSECTS(i1.geom, i2.geom) = TRUE

        WHERE ST_INTERSECTS(i1.geom, i2.geom) = TRUE

        AND i1.id < i2.id''')

        AND i1.id < i2.id'''





db_to_df_sql_string = text("""

db_to_df_sql_string = text("""

SELECT measures."pointid",

SELECT measures."pointid",