Merge pull request #2134 from beefproject/otr-activerecord-update

OTR-ActiveRecord update: added to manually call the database connection

Gemfile

@@ -22,7 +22,7 @@ gem 'rubyzip', '>= 1.2.2'
 gem 'espeak-ruby', '>= 1.0.4' # Text-to-Voice
 gem 'nokogiri', '>= 1.11.1'
 gem 'rake', '>= 12.3.3'
-gem 'otr-activerecord', '~> 1.4.1'
+gem 'otr-activerecord', '>= 1.4.2'
 gem 'sqlite3'
 gem 'rubocop', '~> 0.92.0', require: false
 

beef

@@ -167,12 +167,16 @@ end
 ActiveRecord::Base.logger = nil
 OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
 OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database:db_file)
+# otr-activerecord require you to manually establish the connection with the following line
+#Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+  OTR::ActiveRecord.establish_connection!
+end
 # Migrate (if required)
 context = ActiveRecord::Migration.new.migration_context
 if context.needs_migration?
   ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate
 end
-
 #
 # @note Extensions may take a moment to load, thus we print out a please wait message
 #

spec/beef/api/auth_rate_spec.rb

@@ -43,7 +43,11 @@
 		ActiveRecord::Base.logger = nil
 		OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
 		OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database: db_file)
-
+		# otr-activerecord require you to manually establish the connection with the following line
+		#Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+		if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+			OTR::ActiveRecord.establish_connection!
+  		end
 		context = ActiveRecord::Migration.new.migration_context
 		if context.needs_migration?
 		  ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate

spec/beef/core/main/autorun_engine/autorun_engine_spec.rb

@@ -48,7 +48,11 @@
     ActiveRecord::Base.logger = nil
     OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
     OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file)
-
+    # otr-activerecord require you to manually establish the connection with the following line
+    #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+    if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+      OTR::ActiveRecord.establish_connection!
+    end
     context = ActiveRecord::Migration.new.migration_context
     ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration?
 

spec/beef/extensions/requester_spec.rb

@@ -34,7 +34,12 @@
     ActiveRecord::Base.logger = nil
     OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
     OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database:'beef.db')
-    # Migrate (if required)
+    # otr-activerecord require you to manually establish the connection with the following line
+    #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+    if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+      OTR::ActiveRecord.establish_connection!
+    end
+# Migrate (if required)
     context = ActiveRecord::Migration.new.migration_context
 
 

spec/beef/extensions/websocket_hooked_browser_spec.rb

@@ -48,6 +48,11 @@
     ActiveRecord::Base.logger = nil
     OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
     OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file)
+    # otr-activerecord require you to manually establish the connection with the following line
+    #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+    if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+      OTR::ActiveRecord.establish_connection!
+    end
     context = ActiveRecord::Migration.new.migration_context
     ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration?
     sleep 2

spec/beef/modules/debug/test_beef_debugs_spec.rb

@@ -47,7 +47,11 @@
     ActiveRecord::Base.logger = nil
     OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
     OTR::ActiveRecord.configure_from_hash!(adapter: 'sqlite3', database: db_file)
-
+    # otr-activerecord require you to manually establish the connection with the following line
+    #Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+    if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+      OTR::ActiveRecord.establish_connection!
+    end
     context = ActiveRecord::Migration.new.migration_context
     ActiveRecord::Migrator.new(:up, context.migrations, context.schema_migration).migrate if context.needs_migration?
 

spec/spec_helper.rb

@@ -47,6 +47,11 @@ def reset!
 ActiveRecord::Base.logger = nil
 OTR::ActiveRecord.migrations_paths = [File.join('core', 'main', 'ar-migrations')]
 OTR::ActiveRecord.configure_from_hash!(adapter:'sqlite3', database:':memory:')
+# otr-activerecord require you to manually establish the connection with the following line
+#Also a check to confirm that the correct Gem version is installed to require it, likely easier for old systems.
+if Gem.loaded_specs['otr-activerecord'].version > Gem::Version.create('1.4.2')
+  OTR::ActiveRecord.establish_connection!
+end
 ActiveRecord::Schema.verbose = false
 context = ActiveRecord::Migration.new.migration_context
 if context.needs_migration?