Merge branch 'networkassoc-dbfix' into 'master'

Networkassoc dbfix

wtf happened here...

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -152,7 +152,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
 				"user_notes",
 				"user_notes",
 				"users"));
 				"users"));
 
 
-		dbUpdates.add(new String[]{"CREATE TABLE network_associations (id  SERIAL NOT NULL, create_time TIMESTAMPTZ NOT NULL, ip TEXT, mac TEXT, META TEXT, modify_time TIMESTAMPTZ NOT NULL, status TEXT NOT NULL, event INTEGER, event_user INTEGER, place INTEGER, PRIMARY KEY (id))"});
+		dbUpdates.add(new String[]{"CREATE TABLE network_associations (id  SERIAL NOT NULL, create_time TIMESTAMPTZ NOT NULL, ip TEXT, mac TEXT, meta TEXT, modify_time TIMESTAMPTZ NOT NULL, status TEXT NOT NULL, event INTEGER, event_user INTEGER, place INTEGER, PRIMARY KEY (id))"});
 		
 		
 		dbUpdates.add(new String[] {
 		dbUpdates.add(new String[] {
 				"CREATE TABLE card_text_data (id  SERIAL NOT NULL, font_name TEXT NOT NULL, font_style INTEGER NOT NULL, size INTEGER NOT NULL, text TEXT, text_alignment TEXT NOT NULL, card_text_data_type TEXT NOT NULL, x INTEGER NOT NULL, y INTEGER NOT NULL, z_index INTEGER NOT NULL, PRIMARY KEY (id));"
 				"CREATE TABLE card_text_data (id  SERIAL NOT NULL, font_name TEXT NOT NULL, font_style INTEGER NOT NULL, size INTEGER NOT NULL, text TEXT, text_alignment TEXT NOT NULL, card_text_data_type TEXT NOT NULL, x INTEGER NOT NULL, y INTEGER NOT NULL, z_index INTEGER NOT NULL, PRIMARY KEY (id));"
@@ -186,6 +186,9 @@ public class BootstrapBean implements BootstrapBeanLocal {
 		dbUpdates.add(new String[] {
 		dbUpdates.add(new String[] {
 			"ALTER TABLE event_log RENAME log_id TO id;"	
 			"ALTER TABLE event_log RENAME log_id TO id;"	
 		});	
 		});	
+		dbUpdates.add(new String[] {
+			"ALTER TABLE network_associations ALTER COLUMN meta TYPE json USING (meta::json);"	
+		});
 	}
 	}
 
 
 	@EJB
 	@EJB