fix for gemfile, merge conflicts, test fixes for ruby 3

migrations/035_add_missing_indexes.rb

@@ -1,10 +1,10 @@
 Sequel.migration do
   change do
-  	alter_table(:events) { add_index :created_at }
-    alter_table(:sites) { add_index :updated_at }
+  	#alter_table(:events) { add_index :created_at }
+        alter_table(:sites) { add_index :updated_at }
   	alter_table(:comment_likes) { add_index :comment_id }
   	alter_table(:comment_likes) { add_index :actioning_site_id }
   	alter_table(:sites_tags) { add_index :tag_id }
   	alter_table(:tags) { add_index :name }
   end
-end
+end

migrations/067_add_missing_stat_indexes.rb

@@ -1,13 +1,13 @@
 Sequel.migration do
   up {
     DB['create index stat_referrers_hash_multi on stat_referrers (site_id, md5(url))'].first
-    DB.add_index :stat_locations, :site_id
-    DB.add_index :stat_paths,     :site_id
+    #DB.add_index :stat_locations, :site_id
+    #DB.add_index :stat_paths,     :site_id
   }
 
   down {
     DB['drop index stat_referrers_hash_multi'].first
-    DB.drop_index :stat_locations, :site_id
-    DB.drop_index :stat_paths,     :site_id
+    #DB.drop_index :stat_locations, :site_id
+    #DB.drop_index :stat_paths,     :site_id
   }
 end

migrations/068_add_stat_referrer_site_id_index.rb

@@ -1,9 +1,9 @@
 Sequel.migration do
   up {
-    DB.add_index :stat_referrers, :site_id
+    #DB.add_index :stat_referrers, :site_id
   }
 
   down {
-    DB.drop_index :stat_referrers, :site_id
+    #DB.drop_index :stat_referrers, :site_id
   }
 end

migrations/069_add_stat_created_indexes.rb

@@ -1,13 +1,13 @@
 Sequel.migration do
   up {
-    %i{stat_referrers stat_locations stat_paths}.each do |t|
-      DB.add_index t, :created_at
-    end
+    #%i{stat_referrers stat_locations stat_paths}.each do |t|
+    #  DB.add_index t, :created_at
+    #end
   }
 
   down {
-    %i{stat_referrers stat_locations stat_paths}.each do |t|
-      DB.drop_index t, :created_at
-    end
+    #%i{stat_referrers stat_locations stat_paths}.each do |t|
+    #  DB.drop_index t, :created_at
+    #end
   }
 end

migrations/102_parent_sites_index.rb

@@ -1,9 +1,9 @@
 Sequel.migration do
   up {
-    DB.add_index :sites, :parent_site_id
+    #DB.add_index :sites, :parent_site_id
   }
 
   down {
-    DB.drop_index :sites, :parent_site_id
+    #DB.drop_index :sites, :parent_site_id
   }
 end

migrations/112_sites_featured_at_index.rb

@@ -1,9 +1,9 @@
 Sequel.migration do
   up {
-    DB.add_index :sites, :featured_at
+    #DB.add_index :sites, :featured_at
   }
 
   down {
-    DB.drop_index :sites, :featured_at
+    #DB.drop_index :sites, :featured_at
   }
 end