[MMBASE SCM] r35693 - mmbase/trunk/src/org/mmbase/storage/implementation/database

[michiel]

Author: michiel
Date: 2009-06-04 11:33:01 +0200 (Thu, 04 Jun 2009)
New Revision: 35693

Modified:
   
mmbase/trunk/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
Log:
  MMB-1826

Modified: 
mmbase/trunk/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
===================================================================
--- 
mmbase/trunk/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
     2009-06-04 08:53:42 UTC (rev 35692)
+++ 
mmbase/trunk/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java
     2009-06-04 09:33:01 UTC (rev 35693)
@@ -2305,7 +2305,10 @@
             if (field.isUnique()) {
                 scheme = factory.getScheme(Schemes.CREATE_UNIQUE_KEY, 
Schemes.CREATE_UNIQUE_KEY_DEFAULT);
                 if (scheme != null) {
-                    definitions = scheme.format(this, field.getParent(), 
field, field, field.getMaxLength());
+                    String mkl = (String) 
factory.getAttribute("database-max-key-length");
+                    Integer maxKeyLength = mkl == null ? Integer.MAX_VALUE : 
Integer.parseInt(mkl);
+                    int keyLength = Math.min(maxKeyLength, 
field.getMaxLength());
+                    definitions = scheme.format(this, field.getParent(), 
field, field, keyLength);
                 }
             }
             if (field.getType() == Field.TYPE_NODE) {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs