conversion scripts

diff --git a/scripts/migration.sql b/scripts/migration.sql
index b33ac91..4613b97 100644 (file)
--- a/scripts/migration.sql
+++ b/scripts/migration.sql
@@ -1,25 +1,22 @@
 -- passage à diogenes
-ALTER TABLE `logger.sessions` ADD `auth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `id`;
-ALTER TABLE `logger.sessions` ADD `sauth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `host`;
+ALTER TABLE logger.sessions ADD `auth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `id`;
+ALTER TABLE logger.sessions ADD `sauth` ENUM( 'native' ) DEFAULT 'native' NOT NULL AFTER `host`;
 INSERT INTO logger.actions SET text="connexion_auth_ext",description="connection via l'auth des groupes X";
 
--- gestion des skins
-ALTER TABLE `x4dat.skins` ADD COLUMN `skin_tpl` VARCHAR(32) AFTER `id`;
-
 -- modifs diogenes/logger
-USE logger;
-ALTER TABLE `events` DROP `id` ;
-ALTER TABLE `sessions` ADD INDEX ( `uid` );
-ALTER TABLE `sessions` ADD INDEX ( `uid` );
-ALTER TABLE `events` ADD INDEX ( `session` );
+ALTER TABLE logger.events DROP `id` ;
+ALTER TABLE logger.sessions ADD INDEX ( `uid` );
+ALTER TABLE logger.sessions ADD INDEX ( `uid` );
+ALTER TABLE logger.events ADD INDEX ( `session` );
+DROP TABLE x4dat.log;
 
--- optim trackers
 drop trackers;
+--------------------------------------------------------------------------------
+
 
 --------------------------------------------------------------------------------
 -- X4DAT
 --------------------------------------------------------------------------------
-DROP TABLE x4dat.log
 -- pas sur que je veuille le dropper pr le moment celui la ... a voir
 --*-- ALTER TABLE x4dat.auth_user_md5 DROP COLUMN lastnewslogin;
 
@@ -31,12 +28,24 @@ ALTER TABLE x4dat.auth_user_md5 DROP COLUMN nom_soundex;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN prenom_soundex;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN epouse_soundex;
 -- drop des anciens alias --> aliases
+alter table x4dat.aliases add column expire date;
+ALTER TABLE x$dat.aliases CHANGE `type` `type` ENUM( 'a_vie', 'epouse', 'alias', 'homonyme', 'liste', 'liste-owner', 'liste-request', 'liste-sans-moderation' ) DEFAULT 'alias' NOT NULL
+
+-- auth_user_md5
+update x4dat.aliases as a inner join x4dat.auth_user_md5 as u ON(u.loginbis=a.alias)
+    set a.expire=ADDDATE(u.date_mise_alias_temp,INTERVAL 1 MONTH)
+    WHERE u.date_mise_alias_temp!='' AND u.date_mise_alias_temp!='0000-00-00';
+update x4dat.aliases as a inner join x4dat.auth_user_md5 as u ON(u.loginbis=a.alias) set a.id=u.user_id;
+insert into homonymes select a.id,u.user_id from aliases as a inner join auth_user_md5 as u ON(u.loginbis=a.alias)
+-- drop des colones inutiles
+ALTER TABLE x4dat.auth_user_md5 DROP COLUMN date_mise_alias_temp;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN loginbis;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN username;
 ALTER TABLE x4dat.auth_user_md5 DROP COLUMN alias;
-ALTER TABLE `aliases` CHANGE `type` `type` ENUM( 'a_vie', 'epouse', 'alias', 'homonyme', 'liste', 'liste-owner', 'liste-request', 'liste-sans-moderation' ) DEFAULT 'alias' NOT NULL
+ALTER TABLE x4dat.auth_user_md5 DROP COLUMN username_sasl;
 --------------------------------------------------------------------------------
 
+
 --------------------------------------------------------------------------------
 -- SKINS v2
 --------------------------------------------------------------------------------