commented out redundant query param from deployment script; otherwise…

… changes are trivial
Novartis · Apr 8, 2018 · e284283 · e284283
1 parent d534189
commit e284283
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/yada-api/src/main/java/com/novartis/opensource/yada/YADARequest.java b/yada-api/src/main/java/com/novartis/opensource/yada/YADARequest.java
@@ -903,7 +903,7 @@ public class YADARequest {
 
 	// URL Parameters
 	/**
-	 * Flog indicating whether or not to include the column header in delimited output. Defaults to {@code false}.
+	 * Flag indicating whether or not to include the column header in delimited output. Defaults to {@code false}.
 	 */
 	private boolean    colhead      = false;
 	/**

diff --git a/yada-war/src/main/resources/scripts/YADA_db_PostgreSQL.sql b/yada-war/src/main/resources/scripts/YADA_db_PostgreSQL.sql
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS YADA_UG
 -- INSERT YADA INDEX QUERY CONF
 DELETE from YADA_QUERY_CONF where app = 'YADA' and source = 'java:comp/env/jdbc/yada';
 INSERT into YADA_QUERY_CONF (APP,SOURCE,CONF) values ('YADA','java:comp/env/jdbc/yada',null);
-INSERT into YADA_QUERY_CONF (APP,SOURCE,CONF) values ('YADATEST','java:comp/env/jdbc/yada',
+/*INSERT into YADA_QUERY_CONF (APP,SOURCE,CONF) values ('YADATEST','java:comp/env/jdbc/yada',
 'jdbcUrl=jdbc:postgresql://localhost/yada
 username=yada
 password=yada
@@ -104,6 +104,6 @@ maxLifetime=1800000
 minimumIdle=5
 maximumPoolSize=100
 driverClassName=org.postgresql.Driver');
-INSERT into YADA_QUERY_CONF (APP,SOURCE,CONF) values ('QGO',null,'http://www.ebi.ac.uk/QuickGO/GTerm?');
+INSERT into YADA_QUERY_CONF (APP,SOURCE,CONF) values ('QGO',null,'http://www.ebi.ac.uk/QuickGO/GTerm?');*/
 INSERT into YADA_QUERY_CONF (APP,SOURCE,CONF) values ('YADAFSIN',null,'file:///io/in');
 INSERT into YADA_QUERY (qname,query,created_by,app) VALUES ('YADA default','select ''YADA is alive''','YADABOT','YADA');
diff --git a/yada-war/src/main/resources/scripts/YADA_query_essentials.sql b/yada-war/src/main/resources/scripts/YADA_query_essentials.sql
@@ -236,7 +236,7 @@ INSERT into YADA_QUERY (qname,query,created_by,app) VALUES ('YADA select prop va
 INSERT into YADA_QUERY (qname,query,created_by,app) VALUES ('YADA check credentials','select a.app "APP", a.userid "USERID", a.role "ROLE" from yada_ug a join yada_user b on a.userid = b.userid where b.userid=?v and b.pw=?v','YADABOT','YADA');
 INSERT into YADA_PARAM (id,target,name,rule,value) VALUES ('1','YADA check credentials','pl',1,'Login');
 -- 'YADA select apps' requires content policy to filter for userid in YADA_UG - user must be mapped to app in yada_ug table
-INSERT into YADA_PARAM (id,target,name,rule,value) VALUES ('1','YADA select apps','pl',1,'Gatekeeper,execution.policy=void,content.policy.predicate=userid=getLoggedUser()');
+-- INSERT into YADA_PARAM (id,target,name,rule,value) VALUES ('1','YADA select apps','pl',1,'Gatekeeper,execution.policy=void,content.policy.predicate=userid=getLoggedUser()');
 -- INSERT into YADA_PARAM (id,target,name,rule,value) VALUES ('1','YADA select apps','pl',1,'Gatekeeper,content.policy=void,execution.policy.columns=userid:getLoggedUser()');
 
 -- baseline sec