update travis .sh scripts

Author: stephanie

.travis.yml

@@ -42,12 +42,7 @@ addons:
       - wx2.8-i18n
 
 
-#  mariadb: '10.1'
-before_script:
-  - ci-helpers/travis/mysql_setup.sh
-#  - ./ci-helpers/travis/mysql_setup.sh
-  - ci-helpers/travis/postgres_setup.sh
-  - ci-helpers/travis/freetds.sh
+
 
 
 before_install:
@@ -67,7 +62,7 @@ install: # now just our code
 #  mariadb: '10.1'
 before_script:
   - chmod +x ./ci-helpers/travis/mysql_setup.sh
-#  - chmod +x ../ci-helpers/travis/postgres_setup.sh
+#  - chmod +x ./ci-helpers/travis/postgres_setup.sh
   - chmod +x ./ci-helpers/travis/freetds.sh
   - ./ci-helpers/travis/mysql_setup.sh
 #  - ./ci-helpers/travis/postgres_setup.sh

ci-helpers/travis/mysql_setup.sh

@@ -21,8 +21,8 @@ mysql -e "create database IF NOT EXISTS odm2test;" --user=root
 #####
 # install
 #####
-ls -al  ./tests/scripts/sampledb/odm_mysql.sql ./tests/scripts/sampledb/odm_postgres.sql
-mysql --user=ODM --password=odm  odm < ./tests/scripts/sampledb/odm_mysql.sql
+ls -al  ./tests/data/sampledb/odm_mysql.sql ./tests/data/sampledb/odm_postgres.sql
+mysql --user=ODM --password=odm  odm < ./tests/data/sampledb/odm_mysql.sql
 mysql --user=root  -e  "show databases;"
 mysql --user=root -e   "GRANT ALL PRIVILEGES ON odm.* TO 'ODM'@'localhost';FLUSH PRIVILEGES;"
 # these should produce results, if they don't the lower_case_table_names failed

ci-helpers/travis/postgres_setup.sh

@@ -2,9 +2,9 @@
 psql -U postgres -c "create extension postgis" 
 psql -c 'DROP DATABASE IF EXISTS odmtest;' -U postgres;
 psql -c 'create database odmtest;' -U postgres;
-#psql -U postgres -d odmtest -a -f ./tests/scripts/sampledb/odm_postgres.sql
+#psql -U postgres -d odmtest -a -f ./tests/data/sampledb/odm_postgres.sql
 psql -c 'DROP DATABASE IF EXISTS odm;' -U postgres;
 psql -c 'create database odm;' -U postgres;
   ## install
   # add -a to psql to see full log, -q is quiet
-psql -U postgres -q  -f ./tests/scripts/sampledb/odm_postgres.sql
+psql -U postgres -q  -f ./tests/data/sampledb/odm_postgres.sql