lib/hanami/generators/database_config.rb in hanami-0.8.0 vs lib/hanami/generators/database_config.rb in hanami-0.9.0

- old
+ new

@@ -8,24 +8,25 @@ 'mysql' => { type: :sql, mri: 'mysql2', jruby: 'jdbc-mysql' }, 'mysql2' => { type: :sql, mri: 'mysql2', jruby: 'jdbc-mysql' }, 'postgresql' => { type: :sql, mri: 'pg', jruby: 'jdbc-postgres' }, 'postgres' => { type: :sql, mri: 'pg', jruby: 'jdbc-postgres' }, 'sqlite' => { type: :sql, mri: 'sqlite3', jruby: 'jdbc-sqlite3' }, - 'sqlite3' => { type: :sql, mri: 'sqlite3', jruby: 'jdbc-sqlite3' }, - 'filesystem' => { type: :file_system, mri: nil, jruby: nil }, - 'memory' => { type: :memory, mri: nil, jruby: nil } + 'sqlite3' => { type: :sql, mri: 'sqlite3', jruby: 'jdbc-sqlite3' } }.freeze - DEFAULT_ENGINE = 'filesystem'.freeze + DEFAULT_ENGINE = 'sqlite'.freeze attr_reader :engine, :name def initialize(engine, name) @engine = engine @name = name - SUPPORTED_ENGINES.key?(engine.to_s) or fail "\"#{ engine }\" is not a valid database type" + unless SUPPORTED_ENGINES.key?(engine.to_s) # rubocop:disable Style/GuardClause + warn %(`#{engine}' is not a valid database engine) + exit(1) + end end def to_hash { gem: gem, @@ -40,12 +41,12 @@ def sql? type == :sql end - def filesystem? - type == :file_system + def sqlite? + ['sqlite', 'sqlite3'].include?(engine) end private def platform @@ -77,13 +78,9 @@ end when 'postgresql', 'postgres' "postgres://localhost/#{ name }" when 'sqlite', 'sqlite3' "sqlite://db/#{ Shellwords.escape(name) }" - when 'memory' - "memory://localhost/#{ name }" - when 'filesystem' - "file:///db/#{ Shellwords.escape(name) }" end end def environment_uri(environment) case engine