Explorar o código

bugfix:
- fixed migration script

Dmitriev Roman %!s(int64=4) %!d(string=hai) anos
pai
achega
e467a4e5a1

+ 1 - 0
updates/20211129/mysql-patch-to-2.4.sql

@@ -1,4 +1,5 @@
 ALTER TABLE `auth_rules` ADD `ou_id` INT NULL DEFAULT NULL AFTER `user_id`;
+ALTER TABLE `auth_rules` CHANGE `user_id` `user_id` INT(11) NULL DEFAULT NULL;
 ALTER TABLE `OU` ADD `default_users` BOOLEAN NOT NULL DEFAULT FALSE AFTER `ou_name`;
 ALTER TABLE `OU` ADD `default_hotspot` BOOLEAN NOT NULL DEFAULT FALSE AFTER `default_users`;
 ALTER TABLE `User_list` ADD `device_id` INT NULL DEFAULT NULL AFTER `ou_id`;

+ 1 - 1
updates/20211129/upgrade-to-2.4.pl

@@ -71,7 +71,7 @@ for (my $i=1; $i < scalar(@auth_list); $i++) {
     $new_user->{fio}=$auth_list[$i]->{comments};
     my $new_id = insert_record($dbh,"User_list",$new_user);
     if ($new_id) {
-        do_sql($dbh,"UPDATE User_auth SET user_id=$new_id WHERE mac='".$auth_list[$i]->{mac}."' and deleted=0");
+        do_sql($dbh,"UPDATE User_auth SET user_id=$new_id WHERE user_id=".$row->{id}." AND mac='".$auth_list[$i]->{mac}."' and deleted=0");
 	print "Created user for mac $auth_list[$i]->{mac} : $new_user->{login} and move all auth records for this mac to new user id: $new_id\n";
 	} else {
 	print "Error create user for ".Dumper($auth_list[$i])."\n";