Merge pull request #26 from openmicroanalysis/sqlalchemy

Fix sqlalchemy 2

Author: ppinard

pyxray/sql/base.py

@@ -139,7 +139,7 @@ def _get_row(self, dataclass):
 
             clauses.append(clause)
 
-        statement = sqlalchemy.sql.select([table.c.id]).where(
+        statement = sqlalchemy.sql.select(table.c.id).where(
             sqlalchemy.sql.and_(*clauses)
         )
 

pyxray/sql/data.py

@@ -40,7 +40,7 @@ def add_orderby(self, column, ascending=True):
         self._orderbys.append((column, ascending))
 
     def build(self):
-        statement = sqlalchemy.sql.select(self._columns)
+        statement = sqlalchemy.sql.select(*self._columns)
 
         if self._distinct:
             statement = statement.distinct()