Skip to content

Commit fd7ab27

Browse files
author
stephanie
committed
update method query
1 parent 1776d7a commit fd7ab27

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

appveyor.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,23 @@ environment:
1313
PIP_DEPENDENCIES: "pyodbc,pytest"
1414
#,-e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
1515

16-
17-
18-
19-
2016
# postgres
2117
POSTGRES_PORT: tcp://localhost:5432
2218
POSTGRES_ENV_POSTGRES_USER: postgres
2319
POSTGRES_ENV_POSTGRES_PASSWORD: Password12!
2420
POSTGRES_ENV_POSTGRES_DB: odm2
25-
POSTGRES_PATH: C:\\Program Files\\PostgreSQL\\9.4
21+
POSTGRES_PATH: C:\Program Files\PostgreSQL\9.4
2622
PGUSER: postgres
2723
PGPASSWORD: Password12!
24+
2825
# mysql
2926
MYSQL_PORT: tcp://localhost:3306
3027
MYSQL_ENV_MYSQL_USER: root
3128
MYSQL_ENV_MYSQL_PASSWORD: Password12!
3229
MYSQL_ENV_MYSQL_DATABASE: odm2
33-
MYSQL_PATH: C:\\Program Files\\MySql\\MySQL Server 5.6
30+
MYSQL_PATH: C:\Program Files\MySql\MySQL Server 5.6
3431
MYSQL_PWD: Password12!
32+
3533
# sql server
3634
SQLSERVER_ENV_SQLSERVER_HOST: localhost
3735
SQLSERVER_ENV_SQLSERVER_PORT: 1433
@@ -102,18 +100,16 @@ build_script:
102100
##https://github.com/sqlectron/sqlectron-core/blob/master/appveyor.yml
103101
- echo %PATH%
104102

105-
# mysql
106-
- sh ci-helpers\mysql_setup.sh
107-
# - mysql -e "drop database test; create database odm2;" --user=root
108-
# - mysql odm2 < tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql --user=root
109-
110103
# postgres
111104
- sh ci-helpers\postgres_setup.sh
112105
# - psql createdb marchantariats
113106
# - psql -d marchantariats -a -f tests/usecasesql/marchantariats/marchantariats.sql
114107

115108

116-
109+
# mysql
110+
- sh ci-helpers\mysql_setup.sh
111+
# - mysql -e "drop database test; create database odm2;" --user=root
112+
# - mysql odm2 < tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql --user=root
117113

118114
# sqlserver
119115
- ps: ci-helpers\appveyor\sqlserver.ps1 SQL2008R2SP2

odm2api/ODM2/services/readService.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def getMethods(self, ids=None, codes=None, type=None):
239239
if type: q = q.filter_by(MethodTypeCV=type)
240240

241241
try:
242-
q.all()
242+
return q.all()
243243
except Exception as e:
244244
print("Error running Query: %s" % e)
245245
return None

0 commit comments

Comments
 (0)