svn commit: r1053722 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1053722 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java

jaz-3
Author: jaz
Date: Wed Dec 29 20:00:36 2010
New Revision: 1053722

URL: http://svn.apache.org/viewvc?rev=1053722&view=rev
Log:
changed the sql generated from the table-type field (used to specify the table type in mysql) from TYPE (deprecated in 4.1 and removed in 5.5.8 (maybe prior) to use the ENGINE keyword instead; creating tables in mysql 5.5.8 now working again

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1053722&r1=1053721&r2=1053722&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Wed Dec 29 20:00:36 2010
@@ -1735,7 +1735,11 @@ public class DatabaseUtil {
 
         // if there is a tableType, add the TYPE arg here
         if (UtilValidate.isNotEmpty(this.datasourceInfo.tableType)) {
-            sqlBuf.append(" TYPE ");
+         // jaz:20101229 - This appears to be only used by mysql and now mysql has
+            // deprecated (and in 5.5.x removed) the use of the TYPE keyword. This is
+            // changed to ENGINE which is supported starting at 4.1
+            sqlBuf.append(" ENGINE ");
+            //sqlBuf.append(" TYPE ");
             sqlBuf.append(this.datasourceInfo.tableType);
         }