Fixes migration from v3. (#910)

* fixes #908
* add regression test for mysql (on distribution only, good enough)

.github/workflows/Build-Dist.yml

@@ -111,6 +111,7 @@ jobs:
         run: |
           sudo service mysql start
           mysql -uroot -proot -e 'create database homestead_test;'
+          mysql -uroot -proot homestead_test < .github/workflows/v3.sql
           cp .github/workflows/.env.mariadb Lychee/.env
 
       - name: setup PostGre Database

.github/workflows/v3.sql

@@ -0,0 +1,113 @@
+-- phpMyAdmin SQL Dump
+-- version 5.0.2
+-- https://www.phpmyadmin.net/
+--
+-- Hôte : localhost
+-- Généré le : lun. 08 fév. 2021 à 20:04
+-- Version du serveur :  10.5.8-MariaDB-3
+-- Version de PHP : 7.4.11
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Base de données : `homestead`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `lychee_albums`
+--
+
+CREATE TABLE `lychee_albums` (
+  `id` bigint(14) UNSIGNED NOT NULL,
+  `title` varchar(100) NOT NULL DEFAULT '',
+  `description` varchar(1000) DEFAULT '',
+  `sysstamp` int(11) NOT NULL,
+  `public` tinyint(1) NOT NULL DEFAULT 0,
+  `visible` tinyint(1) NOT NULL DEFAULT 1,
+  `downloadable` tinyint(1) NOT NULL DEFAULT 0,
+  `password` varchar(100) DEFAULT NULL,
+  `min_takestamp` int(11) NOT NULL,
+  `max_takestamp` int(11) NOT NULL,
+  `license` varchar(20) DEFAULT 'none'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Déchargement des données de la table `lychee_albums`
+--
+
+INSERT INTO `lychee_albums` (`id`, `title`, `description`, `sysstamp`, `public`, `visible`, `downloadable`, `password`, `min_takestamp`, `max_takestamp`, `license`) VALUES
+(16128109002453, 'test', '', 1612810900, 0, 1, 0, NULL, 0, 0, 'none');
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `lychee_photos`
+--
+
+CREATE TABLE `lychee_photos` (
+  `id` bigint(14) UNSIGNED NOT NULL,
+  `title` varchar(100) NOT NULL DEFAULT '',
+  `description` varchar(1000) DEFAULT '',
+  `url` varchar(100) NOT NULL,
+  `tags` varchar(1000) NOT NULL DEFAULT '',
+  `public` tinyint(1) NOT NULL,
+  `type` varchar(15) DEFAULT NULL,
+  `width` int(11) NOT NULL,
+  `height` int(11) NOT NULL,
+  `size` varchar(20) NOT NULL,
+  `iso` varchar(15) NOT NULL,
+  `aperture` varchar(20) NOT NULL,
+  `make` varchar(50) NOT NULL,
+  `model` varchar(50) NOT NULL,
+  `lens` varchar(100) NOT NULL DEFAULT '',
+  `shutter` varchar(30) NOT NULL,
+  `focal` varchar(20) NOT NULL,
+  `takestamp` int(11) DEFAULT NULL,
+  `star` tinyint(1) NOT NULL,
+  `thumbUrl` char(37) NOT NULL,
+  `album` bigint(14) UNSIGNED NOT NULL,
+  `checksum` char(40) DEFAULT NULL,
+  `medium` tinyint(1) NOT NULL DEFAULT 0,
+  `small` tinyint(1) NOT NULL DEFAULT 0,
+  `license` varchar(20) NOT NULL DEFAULT 'none'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Déchargement des données de la table `lychee_photos`
+--
+
+INSERT INTO `lychee_photos` (`id`, `title`, `description`, `url`, `tags`, `public`, `type`, `width`, `height`, `size`, `iso`, `aperture`, `make`, `model`, `lens`, `shutter`, `focal`, `takestamp`, `star`, `thumbUrl`, `album`, `checksum`, `medium`, `small`, `license`) VALUES
+(16128109116437, 'sky_color_2x', '', 'de2484a90bafa7e4ae318cf8a4451297.png', '', 0, 'image/png', 560, 861, '58 KB', '', '', '', '', '', '', '', 0, 0, 'de2484a90bafa7e4ae318cf8a4451297.jpeg', 16128109002453, '6fba378a431c273862b1f3d3106f2ac1d8c55983', 0, 1, 'none');
+
+--
+-- Index pour les tables déchargées
+--
+
+--
+-- Index pour la table `lychee_albums`
+--
+ALTER TABLE `lychee_albums`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Index pour la table `lychee_photos`
+--
+ALTER TABLE `lychee_photos`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `Index_album` (`album`),
+  ADD KEY `Index_star` (`star`);
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

database/migrations/2018_08_15_102039_move_albums.php

@@ -21,16 +21,16 @@ public function up()
 				$results = DB::table(env('DB_OLD_LYCHEE_PREFIX', '') . 'lychee_albums')->select('*')->orderBy('id', 'asc')->get();
 				$id = 0;
 				foreach ($results as $result) {
-					$album = new Album();
 					$id = Helpers::trancateIf32($result->id, $id);
-					$album->id = $id;
-					$album->title = $result->title;
-					$album->description = $result->description;
-					$album->public = $result->public;
-					$album->visible_hidden = $result->visible;
-					$album->license = $result->license ?? 'none';
-					$album->created_at = date('Y-m-d H:i:s', $result->sysstamp);
-					$album->save();
+					DB::table('albums')->insert([
+						'id' => $id,
+						'title' => $result->title,
+						'description' => $result->description,
+						'public' => $result->public,
+						'visible_hidden' => $result->visible,
+						'license' => $result->license ?? 'none',
+						'created_at' => date('Y-m-d H:i:s', $result->sysstamp),
+					]);
 				}
 			} else {
 				Logs::notice(__FUNCTION__, __LINE__, env('DB_OLD_LYCHEE_PREFIX', '') . 'lychee_albums does not exist!');