Merge pull request #1315 from metabase/patch-v0.12.1

Merge patch v0.12.1 fixes back into master

OSX/Metabase/Metabase-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.12.0.1</string>
+	<string>0.12.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.12.0.1</string>
+	<string>0.12.0.7</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

bin/osx-release

@@ -187,7 +187,7 @@ sub create_dmg_from_source_dir {
            '-fs', 'HFS+',
            '-fsargs', '-c c=64,a=16,e=16',
            '-format', 'UDRW',
-           '-size', '144MB',          # it looks like this can be whatever size we want; compression slims it down
+           '-size', '256MB',          # it looks like this can be whatever size we want; compression slims it down
            $dmg_filename) == 0 or die $!;
 }
 

bin/osx-setup

@@ -19,6 +19,7 @@ use constant UBERJAR_SRC => getcwd() . '/target/uberjar/metabase.jar';
 use constant UBERJAR_DEST => getcwd() . '/OSX/Resources/metabase.jar';
 
 use constant ENABLE_JAR_PACKING => 0;
+use constant ENABLE_JAR_OPTIONAL_FILE_STRIPPING => 0;
 
 sub remove_jre_optional_files {
     my @optional_files = ('bin/keytool',
@@ -70,7 +71,7 @@ sub pack_jre_jars {
 (rcopy(JRE_HOME, JRE_DEST) or die $!) unless -d JRE_DEST;
 
 # Remove optional files from JRE dest
-remove_jre_optional_files();
+remove_jre_optional_files() if ENABLE_JAR_OPTIONAL_FILE_STRIPPING;
 
 # Pack JARs in JRE if applicable
 pack_jar() if ENABLE_JAR_PACKING;

frontend/src/admin/settings/components/SettingsSetting.jsx

@@ -49,8 +49,8 @@ export default class SettingsSetting extends Component {
                 value={setting.value}
                 options={setting.options}
                 onChange={this.props.updateSetting.bind(null, setting)}
-                optionNameFn={option => option}
-                optionValueFn={option => option}
+                optionNameFn={option => typeof option === "object" ? option.name : option }
+                optionValueFn={option => typeof option === "object" ? option.value : option }
             />
         );
     }

frontend/src/admin/settings/settings.controllers.js

@@ -8,6 +8,7 @@ var SettingsAdminControllers = angular.module('metabaseadmin.settings.controller
 
 // from common.clj
 var TIMEZONES = [
+    { name: "Database Default", value: "" },
     "GMT",
     "UTC",
     "US/Alaska",

frontend/src/setup/components/DatabaseStep.jsx

@@ -37,25 +37,45 @@ export default class DatabaseStep extends Component {
             'formError': null
         });
 
+        // make sure that we are trying ssl db connections to start with
+        details.details.ssl = true;
+
         try {
-            // validate them first
+            // validate the details before we move forward
             await this.props.dispatch(validateDatabase(details));
 
-            // now that they are good, store them
-            this.props.dispatch(setDatabaseDetails({
-                'nextStep': ++this.props.stepNumber,
-                'details': details
-            }));
+        } catch (error) {
+            let formError = error;
+            details.details.ssl = false;
 
-            MetabaseAnalytics.trackEvent('Setup', 'Database Step', this.state.engine);
+            try {
+                // ssl connection failed, lets try non-ssl
+                await this.props.dispatch(validateDatabase(details));
 
-        } catch (error) {
-            MetabaseAnalytics.trackEvent('Setup', 'Error', 'database validation: '+this.state.engine);
+                formError = null;
+
+            } catch (error2) {
+                formError = error2;
+            }
+
+            if (formError) {
+                MetabaseAnalytics.trackEvent('Setup', 'Error', 'database validation: '+this.state.engine);
+
+                this.setState({
+                    'formError': formError
+                });
 
-            this.setState({
-                'formError': error
-            });
+                return;
+            }
         }
+
+        // now that they are good, store them
+        this.props.dispatch(setDatabaseDetails({
+            'nextStep': ++this.props.stepNumber,
+            'details': details
+        }));
+
+        MetabaseAnalytics.trackEvent('Setup', 'Database Step', this.state.engine);
     }
 
     skipDatabase() {