Browse Source

Maintenance: Drop nulldb adapter.

Martin Gruner 1 year ago
parent
commit
ed3a9d1235

+ 0 - 1
Gemfile

@@ -18,7 +18,6 @@ gem 'parallel'
 gem 'puma', group: :puma
 
 # core - supported ORMs
-gem 'activerecord-nulldb-adapter', group: :nulldb
 gem 'mysql2', group: :mysql
 gem 'pg', '~> 1.5', '>= 1.5.4', group: :postgres
 

+ 0 - 3
Gemfile.lock

@@ -87,8 +87,6 @@ GEM
       activesupport (= 7.0.8.1)
     activerecord-import (1.5.1)
       activerecord (>= 4.2)
-    activerecord-nulldb-adapter (1.0.1)
-      activerecord (>= 5.2.0, < 7.2)
     activerecord-session_store (2.1.0)
       actionpack (>= 6.1)
       activerecord (>= 6.1)
@@ -730,7 +728,6 @@ DEPENDENCIES
   PoParser
   aasm
   activerecord-import
-  activerecord-nulldb-adapter
   activerecord-session_store
   acts_as_list
   argon2

+ 10 - 5
contrib/docker/setup.sh

@@ -2,7 +2,7 @@
 set -e
 
 if [ "$1" = 'builder' ]; then
-  PACKAGES="build-essential curl git libimlib2-dev libpq-dev shared-mime-info"
+  PACKAGES="build-essential curl git libimlib2-dev libpq-dev shared-mime-info postgresql"
 elif [ "$1" = 'runner' ]; then
   PACKAGES="curl libimlib2 libpq5 nginx gnupg"
 fi
@@ -14,14 +14,19 @@ apt-get install -y --no-install-recommends ${PACKAGES}
 rm -rf /var/lib/apt/lists/*
 
 if [ "$1" = 'builder' ]; then
+  # Create an empty DB just so that the Rails stack can run.
+  /etc/init.d/postgresql start
+  su - postgres bash -c "createuser zammad -R -S"
+  su - postgres bash -c "createdb --encoding=utf8 --owner=zammad zammad"
+
   cd "${ZAMMAD_DIR}"
   bundle config set without 'test development mysql'
   bundle install
-  sed -e 's#.*adapter: postgresql#  adapter: nulldb#g' -e 's#.*username:.*#  username: postgres#g' -e 's#.*password:.*#  password: \n  host: zammad-postgresql\n#g' < contrib/packager.io/database.yml.pkgr > config/database.yml
-  sed -i "/require 'rails\/all'/a require\ 'nulldb'" config/application.rb
+
   touch db/schema.rb
-  ZAMMAD_SAFE_MODE=1 bundle exec rake assets:precompile # Don't require Redis.
-  rm -r tmp/cache
+  ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile # Don't require Redis.
+
+  rm -r tmp/*
   script/build/cleanup.sh
 fi
 

+ 0 - 1
lib/zammad/application/initializer/db_preflight_check.rb

@@ -3,7 +3,6 @@
 require 'zammad/application/initializer/db_preflight_check/base'
 require 'zammad/application/initializer/db_preflight_check/mysql2'
 require 'zammad/application/initializer/db_preflight_check/postgresql'
-require 'zammad/application/initializer/db_preflight_check/nulldb'
 
 module Zammad
   class Application

+ 0 - 14
lib/zammad/application/initializer/db_preflight_check/nulldb.rb

@@ -1,14 +0,0 @@
-# Copyright (C) 2012-2024 Zammad Foundation, https://zammad-foundation.org/
-
-module Zammad
-  class Application
-    module Initializer
-      module DbPreflightCheck
-        module Nulldb
-          # no-op
-          def self.perform; end
-        end
-      end
-    end
-  end
-end