Changed the default value of ignore_warnings from false to true. #46 #84

#89 #91
mybatis · Oct 16, 2017 · 2f38956 · 2f38956
1 parent 4b905e2
commit 2f38956
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/org/apache/ibatis/migration/Environment.java b/src/main/java/org/apache/ibatis/migration/Environment.java
@@ -85,7 +85,7 @@ public Environment(File file) {
       this.sendFullScript = Boolean.valueOf(prop.getProperty(SETTING_KEY.send_full_script.name()));
       this.autoCommit = Boolean.valueOf(prop.getProperty(SETTING_KEY.auto_commit.name()));
       this.removeCrs = Boolean.valueOf(prop.getProperty(SETTING_KEY.remove_crs.name()));
-      this.ignoreWarnings = Boolean.valueOf(prop.getProperty(SETTING_KEY.ignore_warnings.name()));
+      this.ignoreWarnings = Boolean.valueOf(prop.getProperty(SETTING_KEY.ignore_warnings.name(), "true"));
 
       this.driverPath = prop.getProperty(SETTING_KEY.driver_path.name());
       this.driver = prop.getProperty(SETTING_KEY.driver.name());

diff --git a/src/main/java/org/apache/ibatis/migration/template_environment.properties b/src/main/java/org/apache/ibatis/migration/template_environment.properties
@@ -64,8 +64,8 @@ full_line_delimiter=false
 # but some do.
 auto_commit=false
 
-# If set to true, warnings from the database do not interrupt migrations.
-ignore_warnings=false
+# If set to false, warnings from the database will interrupt migrations.
+ignore_warnings=true
 
 # Custom driver path to allow you to centralize your driver files
 # Default requires the drivers to be in the drivers directory of your

diff --git a/src/site/xdoc/init.xml b/src/site/xdoc/init.xml
@@ -91,20 +91,16 @@ full_line_delimiter=false
 # Use with JDBC drivers that can accept large
 # blocks of delimited text at once.
 send_full_script=true
-# If set to true, warnings from the database
-# do not interrupt migrations.
-ignore_warnings=false
+# If set to false, warnings from the database
+# will interrupt migrations.
+ignore_warnings=true
 # Custom driver path to avoid copying your drivers
 # driver_path=]]></source>
         <h4>Database specific information</h4>
         <h5>MySQL</h5>
         <ul>
           <li><code>send_full_script</code> must be set to <code>false</code> to execute a script with multiple statements.</li>
         </ul>
-        <h5>PostgreSQL</h5>
-        <ul>
-          <li><code>ignore_warnings</code> should be set to <code>true</code> to prevent migrations from being interrupted unexpectedly. See <a href="https://github.com/mybatis/migrations/issues/84">#84</a> for the details.</li>
-        </ul>
       </subsection>
 
       <subsection name="./scripts">