Merge pull request #330 from OHDSI/release-0.10.7

Release 0.10.7

docs/index.html

@@ -327,7 +327,7 @@ <h1>Features</h1>
 </div>
 <div id="latest-version" class="section level1">
 <h1>Latest version</h1>
-<p><a href="https://github.com/OHDSI/WhiteRabbit/releases/latest"><strong>v0.10.6</strong></a></p>
+<p><a href="https://github.com/OHDSI/WhiteRabbit/releases/latest"><strong>v0.10.7</strong></a></p>
 </div>
 
 

docs/index.md

@@ -21,4 +21,4 @@ It comes with **RabbitInAHat**, an application for interactive design of an ETL
 - Rabbit in a Hat generates ETL specification document according to OMOP templatement according to OMOP template
 
 # Latest version
-[**v0.10.6**](https://github.com/OHDSI/WhiteRabbit/releases/latest)
+[**v0.10.7**](https://github.com/OHDSI/WhiteRabbit/releases/latest)

pom.xml

@@ -6,7 +6,7 @@
     <groupId>org.ohdsi</groupId>
     <artifactId>leporidae</artifactId>
     <packaging>pom</packaging>
-    <version>0.10.6</version>
+    <version>0.10.7</version>
     <modules>
         <module>rabbitinahat</module>
         <module>whiterabbit</module>

rabbit-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.6</version>
+        <version>0.10.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.3.1</version>
+            <version>42.3.2</version>
         </dependency>
         <dependency>
             <groupId>com.cedarsoftware</groupId>

rabbit-core/src/main/java/org/ohdsi/databases/DBConnector.java

@@ -71,7 +71,7 @@ public static Connection connectToRedshift(String server, String user, String pa
 		if (!server.contains("/"))
 			throw new RuntimeException("For Redshift, database name must be specified in the server field (<host>:<port>/<database>?<options>)");
 		try {
-			Class.forName("com.amazon.redshift.jdbc41.Driver");
+			Class.forName("com.amazon.redshift.jdbc42.Driver");
 		} catch (ClassNotFoundException e1) {
 			throw new RuntimeException("Cannot find JDBC driver. Make sure the file RedshiftJDBCx-x.x.xx.xxxx.jar is in the path");
 		}

rabbitinahat/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.6</version>
+        <version>0.10.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

rabbitinahat/src/main/resources/org/ohdsi/rabbitInAHat/dataModel/CDMV6.0.csv

@@ -35,8 +35,8 @@ provider_id,No,INTEGER,A foreign key to the provider in the provider table who w
 care_site_id,No,INTEGER,A foreign key to the care site in the care site table that was visited.,visit_occurrence,cdm
 visit_source_value,No,VARCHAR(50),The source code for the visit as it appears in the source data.,visit_occurrence,cdm
 visit_source_concept_id,Yes,INTEGER,A foreign key to a Concept that refers to the code used in the source.,visit_occurrence,cdm
-admitting_source_concept_id,Yes,INTEGER,A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the admitting source for a visit.,visit_occurrence,cdm
-admitting_source_value,No,VARCHAR(50),The source code for the admitting source as it appears in the source data.,visit_occurrence,cdm
+admitted_from_concept_id,Yes,INTEGER,Use this field to determine where the patient was admitted from. This concept is part of the visit domain and can indicate if a patient was admitted to the hospital from a long-term care facility, for example. ,visit_occurrence,cdm
+admitted_from_source_value,No,VARCHAR(50),The source code for the admitting source as it appears in the source data.,visit_occurrence,cdm
 discharge_to_concept_id,Yes,INTEGER,A foreign key to the predefined concept in the Place of Service Vocabulary reflecting the discharge disposition for a visit.,visit_occurrence,cdm
 discharge_to_source_value,No,VARCHAR(50),The source code for the discharge disposition as it appears in the source data.,visit_occurrence,cdm
 preceding_visit_occurrence_id,No,INTEGER,A foreign key to the VISIT_OCCURRENCE table of the visit immediately preceding this visit,visit_occurrence,cdm

whiterabbit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.6</version>
+        <version>0.10.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

whiterabbit/src/main/java/org/ohdsi/whiteRabbit/WhiteRabbitMain.java

@@ -564,7 +564,7 @@ public void actionPerformed(ActionEvent e) {
 		targetPanel.setLayout(new GridLayout(0, 2));
 		targetPanel.setBorder(BorderFactory.createTitledBorder("Target data location"));
 		targetPanel.add(new JLabel("Data type"));
-		targetType = new JComboBox<>(new String[] { "Delimited text files", "MySQL", "Oracle", "SQL Server", "PostgreSQL" });
+		targetType = new JComboBox<>(new String[] {"Delimited text files", "MySQL", "Oracle", "SQL Server", "PostgreSQL", "PDW"});
 		targetType.setToolTipText("Select the type of source data available");
 		targetType.addItemListener(event -> {
 			targetIsFiles = event.getItem().toString().equals("Delimited text files");
@@ -943,30 +943,36 @@ private DbSettings getTargetDbSettings() {
 			dbSettings.password = targetPasswordField.getText();
 			dbSettings.server = targetServerField.getText();
 			dbSettings.database = targetDatabaseField.getText();
-			if (targetType.getSelectedItem().toString().equals("MySQL"))
-				dbSettings.dbType = DbType.MYSQL;
-			else if (targetType.getSelectedItem().toString().equals("Oracle"))
-				dbSettings.dbType = DbType.ORACLE;
-			else if (sourceType.getSelectedItem().toString().equals("PostgreSQL"))
-				dbSettings.dbType = DbType.POSTGRESQL;
-			else if (sourceType.getSelectedItem().toString().equals("SQL Server")) {
-				dbSettings.dbType = DbType.MSSQL;
-				if (sourceUserField.getText().length() != 0) { // Not using windows authentication
-					String[] parts = sourceUserField.getText().split("/");
-					if (parts.length == 2) {
-						dbSettings.user = parts[1];
-						dbSettings.domain = parts[0];
+			switch(targetType.getSelectedItem().toString()) {
+				case "MySQL":
+					dbSettings.dbType = DbType.MYSQL;
+					break;
+				case "Oracle":
+					dbSettings.dbType = DbType.ORACLE;
+					break;
+				case "PostgreSQL":
+					dbSettings.dbType = DbType.POSTGRESQL;
+					break;
+				case "SQL Server":
+					dbSettings.dbType = DbType.MSSQL;
+					if (targetUserField.getText().length() != 0) { // Not using windows authentication
+						String[] parts = targetUserField.getText().split("/");
+						if (parts.length == 2) {
+							dbSettings.user = parts[1];
+							dbSettings.domain = parts[0];
+						}
 					}
-				}
-			} else if (sourceType.getSelectedItem().toString().equals("PDW")) {
-				dbSettings.dbType = DbType.PDW;
-				if (sourceUserField.getText().length() != 0) { // Not using windows authentication
-					String[] parts = sourceUserField.getText().split("/");
-					if (parts.length == 2) {
-						dbSettings.user = parts[1];
-						dbSettings.domain = parts[0];
+					break;
+				case "PDW":
+					dbSettings.dbType = DbType.PDW;
+					if (targetUserField.getText().length() != 0) { // Not using windows authentication
+						String[] parts = targetUserField.getText().split("/");
+						if (parts.length == 2) {
+							dbSettings.user = parts[1];
+							dbSettings.domain = parts[0];
+						}
 					}
-				}
+					break;
 			}
 
 			if (dbSettings.database.trim().length() == 0) {