--- a/src/group/Group.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/group/Group.cc	2011-09-28 17:27:03.000000000 +0200
@@ -27,7 +27,7 @@
 const char * Group::db_names = "oid, name, body";
 
 const char * Group::db_bootstrap = "CREATE TABLE IF NOT EXISTS group_pool ("
-    "oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, "
+    "oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, "
     "UNIQUE(name))";
 
 /* ************************************************************************ */
--- a/src/host/Host.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/host/Host.cc	2011-09-28 17:27:03.000000000 +0200
@@ -61,7 +61,7 @@
 const char * Host::db_names = "oid, name, body, state, last_mon_time";
 
 const char * Host::db_bootstrap = "CREATE TABLE IF NOT EXISTS host_pool ("
-    "oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, state INTEGER, "
+    "oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, state INTEGER, "
     "last_mon_time INTEGER, UNIQUE(name))";
 
 /* ------------------------------------------------------------------------ */
--- a/src/image/Image.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/image/Image.cc	2011-09-28 17:27:03.000000000 +0200
@@ -74,7 +74,7 @@
 const char * Image::db_names = "oid, name, body, uid, gid, public";
 
 const char * Image::db_bootstrap = "CREATE TABLE IF NOT EXISTS image_pool ("
-    "oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, uid INTEGER, "
+    "oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, uid INTEGER, "
     "gid INTEGER, public INTEGER, UNIQUE(name,uid) )";
 
 /* ------------------------------------------------------------------------ */
--- a/src/nebula/Nebula.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/nebula/Nebula.cc	2011-09-28 17:27:03.000000000 +0200
@@ -643,7 +643,7 @@
 
     oss.str("");
     oss <<  "CREATE TABLE db_versioning (oid INTEGER PRIMARY KEY, "
-            "version VARCHAR(256), timestamp INTEGER, comment VARCHAR(256))";
+            "version VARCHAR(255), timestamp INTEGER, comment VARCHAR(256))";
 
     db->exec(oss);
 
--- a/src/onedb/2.0_to_2.9.80.rb	2011-09-23 16:56:55.000000000 +0200
+++ b/src/onedb/2.0_to_2.9.80.rb	2011-09-28 17:27:04.000000000 +0200
@@ -30,13 +30,13 @@
         ########################################################################
 
         # 2.2 Schema
-        # CREATE TABLE user_pool (oid INTEGER PRIMARY KEY, user_name VARCHAR(256), password TEXT,enabled INTEGER, UNIQUE(user_name));
+        # CREATE TABLE user_pool (oid INTEGER PRIMARY KEY, user_name VARCHAR(255), password TEXT,enabled INTEGER, UNIQUE(user_name));
 
         # Move table user_pool
         @db.run "ALTER TABLE user_pool RENAME TO old_user_pool;"
 
         # Create new user_pool
-        @db.run "CREATE TABLE user_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, UNIQUE(name));"
+        @db.run "CREATE TABLE user_pool (oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, UNIQUE(name));"
 
         user_group_ids = ""
 
@@ -71,14 +71,14 @@
         ########################################################################
 
         # 2.2 Schema
-        # CREATE TABLE host_pool (oid INTEGER PRIMARY KEY,host_name VARCHAR(256), state INTEGER,im_mad VARCHAR(128),vm_mad VARCHAR(128),tm_mad VARCHAR(128),last_mon_time INTEGER, cluster VARCHAR(128), template TEXT, UNIQUE(host_name));
+        # CREATE TABLE host_pool (oid INTEGER PRIMARY KEY,host_name VARCHAR(255), state INTEGER,im_mad VARCHAR(128),vm_mad VARCHAR(128),tm_mad VARCHAR(128),last_mon_time INTEGER, cluster VARCHAR(128), template TEXT, UNIQUE(host_name));
         # CREATE TABLE host_shares(hid INTEGER PRIMARY KEY,disk_usage INTEGER, mem_usage INTEGER, cpu_usage INTEGER,max_disk  INTEGER,  max_mem   INTEGER, max_cpu   INTEGER,free_disk INTEGER,  free_mem  INTEGER, free_cpu  INTEGER,used_disk INTEGER,  used_mem  INTEGER, used_cpu  INTEGER,running_vms INTEGER);
 
         # Move table
         @db.run "ALTER TABLE host_pool RENAME TO old_host_pool;"
 
         # Create new table
-        @db.run "CREATE TABLE host_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, state INTEGER, last_mon_time INTEGER, UNIQUE(name));"
+        @db.run "CREATE TABLE host_pool (oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, state INTEGER, last_mon_time INTEGER, UNIQUE(name));"
 
         # Read each entry in the old table, and insert into new table
         @db.fetch("SELECT * FROM old_host_pool") do |row|
@@ -133,7 +133,7 @@
         @db.run "ALTER TABLE image_pool RENAME TO old_image_pool;"
 
         # Create new table
-        @db.run "CREATE TABLE image_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, uid INTEGER, gid INTEGER, public INTEGER, UNIQUE(name,uid) );"
+        @db.run "CREATE TABLE image_pool (oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, uid INTEGER, gid INTEGER, public INTEGER, UNIQUE(name,uid) );"
 
         # Read each entry in the old table, and insert into new table
         @db.fetch("SELECT * FROM old_image_pool") do |row|
@@ -236,7 +236,7 @@
         ########################################################################
 
         # 2.2 Schema
-        # CREATE TABLE network_pool (oid INTEGER PRIMARY KEY, uid INTEGER, name VARCHAR(256), type INTEGER, bridge TEXT, public INTEGER, template TEXT, UNIQUE(name));
+        # CREATE TABLE network_pool (oid INTEGER PRIMARY KEY, uid INTEGER, name VARCHAR(255), type INTEGER, bridge TEXT, public INTEGER, template TEXT, UNIQUE(name));
         # CREATE TABLE leases (oid INTEGER, ip BIGINT, mac_prefix BIGINT, mac_suffix BIGINT,vid INTEGER, used INTEGER, PRIMARY KEY(oid,ip));
 
         # Move tables
@@ -298,12 +298,12 @@
         # New tables in DB version 1
         ########################################################################
 
-        @db.run "CREATE TABLE db_versioning (oid INTEGER PRIMARY KEY, version VARCHAR(256), timestamp INTEGER, comment VARCHAR(256));"
-        @db.run "CREATE TABLE template_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, uid INTEGER, gid INTEGER, public INTEGER);"
+        @db.run "CREATE TABLE db_versioning (oid INTEGER PRIMARY KEY, version VARCHAR(255), timestamp INTEGER, comment VARCHAR(256));"
+        @db.run "CREATE TABLE template_pool (oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, uid INTEGER, gid INTEGER, public INTEGER);"
         @db.run "CREATE TABLE acl (oid INT PRIMARY KEY, user BIGINT, resource BIGINT, rights BIGINT);"
 
         # The group pool has two default ones
-        @db.run "CREATE TABLE group_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, UNIQUE(name));"
+        @db.run "CREATE TABLE group_pool (oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, UNIQUE(name));"
         @db.run "INSERT INTO group_pool VALUES(0,'oneadmin','<GROUP><ID>0</ID><NAME>oneadmin</NAME><USERS><ID>0</ID></USERS></GROUP>');"
         @db.run "INSERT INTO group_pool VALUES(1,'users','<GROUP><ID>1</ID><NAME>users</NAME><USERS>#{user_group_ids}</USERS></GROUP>');"
 
--- a/src/onedb/2.9.80_to_2.9.85.rb	2011-09-23 16:56:55.000000000 +0200
+++ b/src/onedb/2.9.80_to_2.9.85.rb	2011-09-28 17:27:04.000000000 +0200
@@ -30,7 +30,7 @@
         # now have a <SIZE> element
 
         # Image pool table:
-        # CREATE TABLE image_pool (oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, uid INTEGER, gid INTEGER, public INTEGER, UNIQUE(name,uid) );
+        # CREATE TABLE image_pool (oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, uid INTEGER, gid INTEGER, public INTEGER, UNIQUE(name,uid) );
 
         @db.fetch("SELECT * FROM image_pool") do |row|
             doc = Document.new(row[:body])
--- a/src/pool/test/TestPoolSQL.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/pool/test/TestPoolSQL.cc	2011-09-28 17:27:04.000000000 +0200
@@ -35,7 +35,7 @@
 const char * TestObjectSQL::db_names = "oid,name,body,uid,number";
 
 const char * TestObjectSQL::db_bootstrap = "CREATE TABLE test_pool ("
-    "oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, uid INTEGER, "
+    "oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, uid INTEGER, "
     "number INTEGER)";
 
 /* -------------------------------------------------------------------------- */
--- a/src/um/User.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/um/User.cc	2011-09-28 17:27:05.000000000 +0200
@@ -38,7 +38,7 @@
 const char * User::db_names = "oid,name,body";
 
 const char * User::db_bootstrap = "CREATE TABLE IF NOT EXISTS user_pool ("
-    "oid INTEGER PRIMARY KEY, name VARCHAR(256), body TEXT, UNIQUE(name))";
+    "oid INTEGER PRIMARY KEY, name VARCHAR(255), body TEXT, UNIQUE(name))";
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
--- a/src/vm_template/VMTemplate.cc	2011-09-23 16:56:55.000000000 +0200
+++ b/src/vm_template/VMTemplate.cc	2011-09-28 17:27:06.000000000 +0200
@@ -63,7 +63,7 @@
 
 const char * VMTemplate::db_bootstrap =
     "CREATE TABLE IF NOT EXISTS template_pool (oid INTEGER PRIMARY KEY, "
-    "name VARCHAR(256), body TEXT, uid INTEGER, gid INTEGER, public INTEGER)";
+    "name VARCHAR(255), body TEXT, uid INTEGER, gid INTEGER, public INTEGER)";
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */