Changeset 6981

Timestamp:

Oct 8, 2015, 9:05:54 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Merged pre-3.6-releases to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• config/dist/mysql-queries.xml (modified) (1 diff)
• credits.txt (modified) (1 diff)
• doc/src/docbook/figures/clone_annotation.png (modified) (previous)
• doc/src/docbook/figures/inherit_annotations.png (modified) (previous)
• doc/src/docbook/user/annotations.xml (modified) (2 diffs)
• src/core/net/sf/basedb/core/Update.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/dbengine/AbstractDbEngine.java (modified) (1 diff)
• src/core/net/sf/basedb/core/dbengine/DbEngine.java (modified) (1 diff)
• src/core/net/sf/basedb/core/dbengine/MySQLEngine.java (modified) (1 diff)
• src/core/net/sf/basedb/core/log/db/AnnotationLogger.java (modified) (1 diff)
• www/common/annotations/annotate.js (modified) (6 diffs)
• www/common/annotations/inherit.js (modified) (4 diffs)
• www/common/annotations/inherit.jsp (modified) (1 diff)
• www/common/close_popup.js (modified) (1 diff)

trunk/config/dist/mysql-queries.xml

@@ -28 +28 @@
 -->
 <predefined-queries>
+  <query id="DROP_NOT_NULL_CONSTRAINT" type="SQL">
+    <sql>
+      ALTER TABLE [{1}] MODIFY [{2}] {3} NULL
+    </sql>
+    <description>
+      An SQL query that drops a NOT NULL contraint from column (2) with data type (3)
+      in a table (1).
+    </description>
+  </query>
 
 </predefined-queries>

trunk/credits.txt

@@ -1 +1 @@
 $Id$
 
-The current BASE team is (at BASE 3.5 release)
+The current BASE team is (at BASE 3.6 release)
 {{{
 Jari Häkkinen

trunk/doc/src/docbook/user/annotations.xml

@@ -807 +807 @@
         </para>
         
+        <para>
+          Use the <guibutton>Inherit</guibutton> button to inherit the selected
+          annotations by reference, and the <guibutton>Clone</guibutton> button
+          to clone the values of the selected annotations.
+        </para>
+        
         <note>
           <itemizedlist>
           <listitem>
             <para>
-            Already inherited annotations are not shown in the dialog.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-            By default, the inheritance is implemented by reference. To convert 
-            it to a cloned annotation select it in the list and click on <guilabel>clone</guilabel>.
+            Already inherited or cloned annotations are not shown in the dialog.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+            Annotations that are inherited by reference can easily be converted to
+            cloned annotations. Select the annotation in the list and click on the
+            <guilabel>clone</guilabel> link.
             <nohelp>
             <figure>
@@ -831 +838 @@
             </figure>
             </nohelp>
-
             </para>
           </listitem>

trunk/src/core/net/sf/basedb/core/Update.java

@@ -1337 +1337 @@
       
       // Drop NOT NULL on Annotations.value_id
-      dropNotNullConstraint(session, "Annotations", "value_id");
+      dropNotNullConstraint(session, "Annotations", "value_id", "int");
 
       // Drop UNIQUE constraint on Annotations.annotationset_id/annotationtype_id
@@ -1657 +1657 @@
       TableInfo info = getTableInfo(session, tableName);
       String indexName = info.findIndexName(null, new HashSet<String>(Arrays.asList(columnNames)));
+
       if (indexName != null)
       {
         DbEngine engine = HibernateUtil.getDbEngine();
+
+        // Drop foreign keys using any of the column names in the index
+        List<ForeignKeyInfo> dropped = new ArrayList<ForeignKeyInfo>();
+        if (engine.dropForeignKeysUsedInIndex())
+        {
+          for (ForeignKeyInfo fk : info.getForeignKeys())
+          {
+            for (String colName : columnNames)
+            {
+              if (fk.getFkColumns().contains(colName))
+              {
+                dropped.add(fk);
+                String fkSql = engine.getDropForeignKeySql(null, null, tableName, fk.getName());
+                query = HibernateUtil.createSqlQuery(session, fkSql);
+                query.executeUpdate();
+                break;
+              }
+            }
+          }
+        }
+        
         String sql = engine.getDropIndexSql(null, null, tableName, indexName, unique);
         query = HibernateUtil.createSqlQuery(session, sql);
         query.executeUpdate();
+        
+        // Re-created dropped foreign keys
+        for (ForeignKeyInfo fk : dropped)
+        {
+          String fkSql = engine.getCreateForeignKeySql(null, null, tableName, fk.getName(), fk.getFkColumns(), fk.getRefName(), fk.getRefColumns());
+          query = HibernateUtil.createSqlQuery(session, fkSql);
+          query.executeUpdate();
+        }
+
       }
       // Only commit if we started a new transaction
@@ -1696 +1727 @@
   }
 
-  private static void dropNotNullConstraint(org.hibernate.Session session, String tableName, String columnName)
+  private static void dropNotNullConstraint(org.hibernate.Session session, String tableName, String columnName, String mySqlDataType)
   {
     org.hibernate.Transaction tx = null;
@@ -1705 +1736 @@
       tx = session.getTransaction().isActive() ? null : HibernateUtil.newTransaction(session);
       
-      query = HibernateUtil.getPredefinedSQLQuery(session, "DROP_NOT_NULL_CONSTRAINT", tableName, columnName);
+      query = HibernateUtil.getPredefinedSQLQuery(session, "DROP_NOT_NULL_CONSTRAINT", tableName, columnName, mySqlDataType);
       query.executeUpdate();
       

trunk/src/core/net/sf/basedb/core/dbengine/AbstractDbEngine.java

@@ -75 +75 @@
   }
 
-  
+  /**
+    @return FALSE
+    @since 3.6
+  */
+  @Override
+  public boolean dropForeignKeysUsedInIndex()
+  {
+    return false;
+  }
+
   /**
     Return the SQL unmodified.

trunk/src/core/net/sf/basedb/core/dbengine/DbEngine.java

@@ -123 +123 @@
   */
   public String getDropIndexSql(String catalog, String schema, String table, String name, boolean unique);
+  
+  /**
+    When dropping an index, must foreign keys that uses the same columns also be
+    dropped (before dropping the index)? Default is FALSE, but MySQL need TRUE.
+    @since 3.6
+  */
+  public boolean dropForeignKeysUsedInIndex();
   
   /**

trunk/src/core/net/sf/basedb/core/dbengine/MySQLEngine.java

@@ -114 +114 @@
     sql.append(")");
     return sql.toString();
+  }
+  
+  /**
+    @return TRUE
+    @since 3.6
+  */
+  @Override
+  public boolean dropForeignKeysUsedInIndex()
+  {
+    return true;
   }
   

trunk/src/core/net/sf/basedb/core/log/db/AnnotationLogger.java

@@ -40 +40 @@
 import net.sf.basedb.core.log.EntityLogger;
 import net.sf.basedb.core.log.LogManager;
-import net.sf.basedb.core.plugin.ParameterValues;
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.formatter.Formatter;

trunk/www/common/annotations/annotate.js

@@ -468 +468 @@
     {
       var unit = units[unitNo];
-      var option = new Option(unit.symbol, unit.id, selected == unit.id);
+      var option = new Option(unit.symbol, unit.id, false, selected == unit.id);
       option.title = unit.description;
       unitList[unitList.length] = option;
@@ -683 +683 @@
   annotate.valueOnBlur = function(event)
   {
-    if (!selectedAnnotation && selectedMultiIndex < 0) return;
+    if (!selectedAnnotation || selectedMultiIndex < 0) return;
     
     var frm = document.forms['annotations'];
@@ -981 +981 @@
     Doc.show('inherited-list');
     var inheritedId = event.detail.id;
+    var clone = event.detail.clone;
     
     // Check if we have info about this annotation already
@@ -989 +990 @@
       {
         entry.modified = INHERITED;
+        if (clone && entry.source != 'CLONED')
+        {
+          annotate.convertToCloned(entry);
+        }
+        else if (!clone && entry.source != 'INHERITED')
+        {
+          annotate.convertToInherited(entry);
+        }
         Doc.show(entry.id);
         return;
@@ -1002 +1011 @@
     request.open("GET", url, true);
     request.send(null);
-    Ajax.setReadyStateHandler(request, annotate.inheritInfoLoaded, annotate.inheritInfoLoaded);
+    var callback = clone ? annotate.inheritInfoLoadedAndClone : annotate.inheritInfoLoaded;
+    Ajax.setReadyStateHandler(request, callback, callback);
+  }
+  
+  /**
+    Callback that converts the inherited annotation to a cloned
+    annotation.
+  */
+  annotate.inheritInfoLoadedAndClone = function(request)
+  {
+    var entry = annotate.inheritInfoLoaded(request);
+    annotate.convertToCloned(entry);
   }
   
@@ -1023 +1043 @@
     annotations[annotations.length] = entry;
     annotate.createAnnotationEntryInList(entry, true);
+    return entry;
   }
   

trunk/www/common/annotations/inherit.js

@@ -32 +32 @@
     // Buttons (on standalone dialog)
     Buttons.addClickHandler('close', App.closeWindow);
-    Buttons.addClickHandler('btnOk', inherit.save);
+    Buttons.addClickHandler('btnInherit', inherit.save);
+    Buttons.addClickHandler('btnClone', inherit.save);
     
     Events.addEventHandler('quickFilter', 'keyup', inherit.quickFilter);
@@ -80 +81 @@
   }
   
-  inherit.saveInheritedAnnotations = function()
+  inherit.saveInheritedAnnotations = function(clone)
   {
     var tree = Doc.element('joust');
@@ -100 +101 @@
           var detail = {};
           detail.id = menuItem.externalId;
+          detail.clone = clone;
           if (isInherited) 
           {
@@ -140 +142 @@
     Save the annotations in standalone mode.
   */
-  inherit.save = function()
+  inherit.save = function(event)
   {
-    inherit.saveInheritedAnnotations();
+    var clone = Data.int(event.currentTarget, 'clone', 0);
+    inherit.saveInheritedAnnotations(clone);
     App.closeWindow();
   }

trunk/www/common/annotations/inherit.jsp

@@ -371 +371 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button id="btnOk" title="Ok" />
+    <base:button id="btnClone" title="Clone" image="copy.png" data-clone="1" />
+    <base:button id="btnInherit" title="Inherit" image="inherit.png" />
     <base:button id="close" title="Cancel" />
   </base:buttongroup>

trunk/www/common/close_popup.js

@@ -54 +54 @@
       if (notifyTarget)
       {
-        var evt = document.createEvent('Event');
+        var evt = myOpener.document.createEvent('CustomEvent');
         evt.initEvent('base-notify', false, true);
         notifyTarget.dispatchEvent(evt);