Support Ubuntu 20.04 and MySQL 8 #2856

zorkian · 2021-01-23T23:25:23Z

This modernizes a few things to support more recent versions of MySQL
and Ubuntu. DO NOT RUN IN PRODUCTION YET.

zorkian · 2021-01-23T23:25:51Z

bin/dump-data.pl

@@ -144,7 +144,9 @@ sub db_quote {
 print "Dumping proplists.dat\n";
 open( my $plg, ">$ENV{LJHOME}/bin/upgrading/proplists.dat" )       or die;
 open( my $pll, ">$ENV{LJHOME}/bin/upgrading/proplists-local.dat" ) or die;
-foreach my $table ( 'userproplist', 'talkproplist', 'logproplist', 'usermsgproplist' ) {
+foreach my $table ( 'userproplist', 'talkproplist', 'logproplist', 'usermsgproplist',
+    'media_prop_list' )


oops forgot this a long time ago ...

zorkian · 2021-01-23T23:26:03Z

bin/dump-data.pl

@@ -181,7 +183,7 @@ sub db_quote {
 # and dump mood info
 print "Dumping moods.dat\n";
 open( F, ">$ENV{'LJHOME'}/bin/upgrading/moods.dat" ) or die;
-$sth = $dbh->prepare("SELECT moodid, mood, parentmood FROM moods ORDER BY moodid");
+$sth = $dbh->prepare("SELECT moodid, mood, parentmood, weight FROM moods ORDER BY moodid");


don't know when this became a thing, but moods.dat contains it so we should dump it.

zorkian · 2021-01-23T23:26:16Z

bin/dump-tablecreates.pl

@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+
+use strict;


dumb script for regenerating update-db-general.pl

zorkian · 2021-01-23T23:26:54Z

bin/upgrading/moods.dat

@@ -130,760 +130,6 @@ MOOD 131 thankful 15 80
 MOOD 132 grateful 15 85


This file was re-dumped, which put things in order...

zorkian · 2021-01-23T23:27:35Z

bin/upgrading/proplists.dat

@@ -62,14 +62,6 @@ userproplist.city:
  multihomed: 0


Should be no actual changes to this file, but I re-dumped it so everything is ordered now instead of just manually updated lol.

zorkian · 2021-01-23T23:28:27Z

bin/upgrading/update-db-general.pl

@@ -18,4190 +18,2655 @@

 mark_clustered(@LJ::USER_TABLES);

-register_tablecreate( "vgift_ids", <<'EOC');


This file has been cleanly dumped from an updated database, using MySQL 8. This basically compacts all of the alters so they're gone, which means that it should be much easier to reason about what's in the db.

zorkian · 2021-01-23T23:28:41Z

cgi-bin/DW/Auth/Challenge.pm

@@ -67,7 +67,7 @@ sub check {
        }
        else {
            my $dbh = LJ::get_db_writer();
-            my $rv  = $dbh->do( q{SELECT GET_LOCK(?,5)}, undef, $chal );


64 character limit on lock names now. Hacky easy way to do that.

zorkian · 2021-01-23T23:29:01Z

cgi-bin/DW/VirtualGiftTransaction.pm

@@ -71,7 +71,7 @@ sub save {

    my $u       = LJ::want_user( $opts{user} ) or return;
    my $id      = LJ::alloc_user_counter( $u, 'V' ) or return;
-    my $secs    = $opts{time} || localtime;


Was trying to insert 'Sat Jan 23...' string into the int field expecting an epoch time.

zorkian · 2021-01-23T23:29:33Z

cgi-bin/LJ/Global/Defaults.pm

@@ -260,14 +260,7 @@ no strict "vars";
    # 'type' is used as 'type' attribute value in 'codes' table
    # 'save_region_code' specifies what to save in 'state' userprop  -
    # '1' mean save short region code and '0' - save full region name
-    %LJ::COUNTRIES_WITH_REGIONS = (


I killed RU here because... we don't do it for Canada, so whatever. (And inserting the plain RU states was causing the strict mode SQL to be angry since it's not latin1.)

zorkian · 2021-01-23T23:29:45Z

cgi-bin/LJ/User/Account.pm

@@ -75,9 +75,9 @@ sub create {
    my $dbh = LJ::get_db_writer();

    $dbh->do(
-        'INSERT INTO user (user, clusterid, dversion, caps, journaltype) '


Strict mode fix, name field is required.

zorkian · 2021-01-23T23:30:03Z

cgi-bin/LJ/User/Administration.pm


-    if ( ref $ban_u eq 'ARRAY' ) {


Make this function take user objects or ids, because there are callers that do both.

zorkian · 2021-01-23T23:30:20Z

doc/dependencies-system-20.04

+libio-aio-perl
+libssl-dev
+apache2
+compass-blueprint-plugin


This was ruby-compass, it got renamed. Only change from 18.04 list.

zorkian · 2021-01-23T23:30:40Z

t/console-moodthemes.t

@@ -36,7 +36,7 @@ my $run = sub {

 # FIXME: make this neater.
 ok( $run->("moodtheme_list") =~ "Kanji Moods", "Got public theme" );
-ok( $run->("moodtheme_list 1") =~ "18x18 /img/mood/kanji/crazy.gif", "Got a theme" );


With the re-dumping of moods.dat, the Kanji Moods is #11 now in a fresh db. Won't matter for old dbs.

zorkian · 2021-01-23T23:30:58Z

t/post.t

@@ -48,9 +48,6 @@ note("Not logged in - init");
    # user
    ok( !$vars->{remote} );

-    # icon


Icons were removed by @momijizukamori but the test still expected them, so just removed that.

zorkian · 2021-01-23T23:31:19Z

t/userpic-keyword-select.t

@@ -31,14 +31,6 @@ my $ICON1 = do { local $/; <$fh> };
 open( my $fh2, 'good.jpg' ) or die $!;
 my $ICON2 = do { local $/; <$fh2> };

-note("called with falsy or undefined user object");


I don't know why this test, and it fails in Perl 5.30, so I removed it. But LMK if I'm missing something @nfagerlund !

Oh, that broke when Ruth changed that from a standalone function that takes a user as an argument to a method on a user object -- can't call methods on undef. I think this is a merge conflict now because I noticed that in one of those post-code-push PRs and removed it there.

This modernizes a few things to support more recent versions of MySQL and Ubuntu. DO NOT RUN IN PRODUCTION YET. The has_subs table is unused Remove unused tables subsprop, subsproplist

Using $u->prepare and $sth->execute doesn't set the _dberr on the user, so calling $u->err would never work. Needs to use $u->do.

robodw-issues added the status: untriaged label Jan 23, 2021

zorkian commented Jan 23, 2021

View reviewed changes

bin/dump-tablecreates.pl

@@ -0,0 +1,19 @@

#!/usr/bin/perl

use strict;

Copy link

Member Author

zorkian Jan 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dumb script for regenerating update-db-general.pl

zorkian commented Jan 23, 2021

View reviewed changes

zorkian force-pushed the update-dbs branch from 68f43fd to 3864f24 Compare January 29, 2021 07:00

zorkian added 2 commits January 29, 2021 07:02

Support Ubuntu 20.04 and MySQL 8

500d8f6

This modernizes a few things to support more recent versions of MySQL and Ubuntu. DO NOT RUN IN PRODUCTION YET. The has_subs table is unused Remove unused tables subsprop, subsproplist

Fix absolutely ANCIENT bug

19263c7

Using $u->prepare and $sth->execute doesn't set the _dberr on the user, so calling $u->err would never work. Needs to use $u->do.

zorkian force-pushed the update-dbs branch from 3864f24 to 19263c7 Compare January 29, 2021 07:02

This was referenced Apr 18, 2021

'0000-00-00' is no longer a valid default value for MySQL DATETIME fields as of Ubuntu 16.04 LTS #1822

Closed

Ubuntu 17.10, or one of the package versions associated with it, breaks Dreamwidth #2248

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Ubuntu 20.04 and MySQL 8 #2856

Support Ubuntu 20.04 and MySQL 8 #2856

zorkian commented Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

zorkian Jan 23, 2021

nfagerlund Jan 31, 2021

		@@ -130,760 +130,6 @@ MOOD 131 thankful 15 80
		MOOD 132 grateful 15 85

		@@ -18,4190 +18,2655 @@

		mark_clustered(@LJ::USER_TABLES);

		register_tablecreate( "vgift_ids", <<'EOC');

Support Ubuntu 20.04 and MySQL 8 #2856

Are you sure you want to change the base?

Support Ubuntu 20.04 and MySQL 8 #2856

Conversation

zorkian commented Jan 23, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment