luckyframework · paulcsmith · Jul 9, 2019 · Jul 6, 2019 · Jul 9, 2019 · Jul 9, 2019
diff --git a/config/database.cr b/config/database.cr
@@ -1,10 +1,28 @@
 database_name = "avram_dev"
 
-Avram::Repo.configure do |settings|
+class TestDatabase < Avram::Database
+end
+
+class DatabaseWithIncorrectSettings < Avram::Database
+end
+
+TestDatabase.configure do |settings|
   settings.url = ENV["DATABASE_URL"]? || Avram::PostgresURL.build(
     hostname: "db",
     database: database_name,
     username: "lucky",
     password: "developer"
   )
 end
+
+DatabaseWithIncorrectSettings.configure do |settings|
+  settings.url = Avram::PostgresURL.build(
+    hostname: "db",
+    database: database_name,
+    username: "incorrect"
+  )
+end
+
+Avram.configure do |settings|
+  settings.database_to_migrate = TestDatabase.new
+end
diff --git a/spec/bool_criteria_spec.cr b/spec/bool_criteria_spec.cr
@@ -1,6 +1,6 @@
 require "./spec_helper"
 
-private class QueryMe < Avram::Model
+private class QueryMe < BaseModel
   COLUMN_SQL = "users.id, users.created_at, users.updated_at, users.admin"
 
   table users do

diff --git a/spec/connection_spec.cr b/spec/connection_spec.cr
@@ -2,18 +2,18 @@ require "./spec_helper"
 
 describe Avram::Connection do
   it "displays a helpful error when failing to connect" do
-    conn = Avram::Connection.new("postgres://root:root@localhost:5432/tacoman")
-    message = Regex.new("Failed to connect to databse 'tacoman' with username 'root'.")
+    conn = Avram::Connection.new("postgres://root:root@localhost:5432/tacoman", TestDatabase)
+    message = Regex.new("TestDatabase: Failed to connect to database 'tacoman' with username 'root'.")
     expect_raises(Avram::ConnectionError, message) do
-      conn.try_connection!
+      conn.open
     end
   end
 
   it "suggests trying a password when no password supplied and connection fails" do
-    conn = Avram::Connection.new("postgres://root@localhost:5432/tacoman")
+    conn = Avram::Connection.new("postgres://root@localhost:5432/tacoman", TestDatabase)
     message = Regex.new("You didn't supply a password, did you mean to?")
     expect_raises(Avram::ConnectionError, message) do
-      conn.try_connection!
+      conn.open
     end
   end
 end
diff --git a/spec/criteria_spec.cr b/spec/criteria_spec.cr
@@ -1,6 +1,6 @@
 require "./spec_helper"
 
-private class QueryMe < Avram::Model
+private class QueryMe < BaseModel
   COLUMN_SQL = "users.id, users.created_at, users.updated_at, users.age, users.nickname"
 
   table users do

diff --git a/spec/migrator/migration_spec.cr b/spec/migrator/migration_spec.cr
@@ -37,7 +37,7 @@ describe Avram::Migrator::Migration::V1 do
       MigrationThatPartiallyWorks::V999.new.up
     end
 
-    exists = Avram::Repo.run do |db|
+    exists = TestDatabase.run do |db|
       db.query_one? "SELECT EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'fake_things');", as: Bool
     end
     exists.should be_false
@@ -65,5 +65,5 @@ private def get_column_names(table_name)
     AND table_name = '#{table_name}'
   SQL
 
-  Avram::Repo.run { |db| db.query_all statement, as: String }
+  TestDatabase.run { |db| db.query_all statement, as: String }
 end
diff --git a/spec/model_spec.cr b/spec/model_spec.cr
@@ -1,6 +1,6 @@
 require "./spec_helper"
 
-private class QueryMe < Avram::Model
+private class QueryMe < BaseModel
   COLUMN_SQL = "users.id, users.created_at, users.updated_at, users.email, users.age"
 
   table :users do
@@ -9,40 +9,40 @@ private class QueryMe < Avram::Model
   end
 end
 
-private class ModelWithMissingButSimilarlyNamedColumn < Avram::Model
+private class ModelWithMissingButSimilarlyNamedColumn < BaseModel
   table :users do
     column mickname : String
   end
 end
 
-private class ModelWithOptionalAttributeOnRequiredColumn < Avram::Model
+private class ModelWithOptionalAttributeOnRequiredColumn < BaseModel
   table :users do
     column name : String?
   end
 end
 
-private class ModelWithRequiredAttributeOnOptionalColumn < Avram::Model
+private class ModelWithRequiredAttributeOnOptionalColumn < BaseModel
   table :users do
     column nickname : String
   end
 end
 
-private class MissingTable < Avram::Model
+private class MissingTable < BaseModel
   table :definitely_a_missing_table do
   end
 end
 
-private class MissingButSimilarlyNamedTable < Avram::Model
+private class MissingButSimilarlyNamedTable < BaseModel
   table :uusers do
   end
 end
 
-private class EmptyModelCompilesOk < Avram::Model
+private class EmptyModelCompilesOk < BaseModel
   table :no_fields do
   end
 end
 
-private class InferredTableNameModel < Avram::Model
+private class InferredTableNameModel < BaseModel
   COLUMN_SQL = "inferred_table_name_models.id, inferred_table_name_models.created_at, inferred_table_name_models.updated_at"
 
   table do

diff --git a/spec/multi_database_spec.cr b/spec/multi_database_spec.cr
@@ -0,0 +1,24 @@
+require "./spec_helper"
+
+private class ModelWithBadDatabase < BaseModel
+  table do
+  end
+
+  # Use a different database for this fake model
+  def self.database
+    DatabaseWithIncorrectSettings
+  end
+end
+
+describe "Configuring and connecting to different databases" do
+  it "tries to connect to the configured database" do
+    # It will fail to connect which is what we expect since we configured
+    # a database with an incorrect URL
+    #
+    # If it does not raise an error then the connection is good,
+    # which is not what we configured
+    expect_raises Avram::ConnectionError do
+      ModelWithBadDatabase::BaseQuery.new.select_count
+    end
+  end
+end
diff --git a/spec/query_builder_spec.cr b/spec/query_builder_spec.cr
@@ -172,7 +172,7 @@ describe "Avram::QueryBuilder" do
 
       query.statement.should eq "SELECT * FROM users ORDER BY name ASC, id DESC"
 
-      Avram::Repo.run do |db|
+      TestDatabase.run do |db|
         db.exec query.statement
       end
     end

diff --git a/spec/save_operation_spec.cr b/spec/save_operation_spec.cr
@@ -25,7 +25,7 @@ private class SaveLineItem < LineItem::SaveOperation
   permit_columns :name
 end
 
-private class ValueColumnModel < Avram::Model
+private class ValueColumnModel < BaseModel
   table :value_column_model do
     column value : String
   end
@@ -317,7 +317,7 @@ describe "Avram::SaveOperation" do
       it "logs the failure if a logger is set" do
         log_io = IO::Memory.new
         logger = Dexter::Logger.new(log_io)
-        Avram::Repo.temp_config(logger: logger) do |settings|
+        Avram.temp_config(logger: logger) do |settings|
           SaveUser.create(name: "", age: 30) { |form, record| :unused }
           log_io.to_s.should contain(%("failed_to_save":"SaveUser","validation_errors":"name is required. joined_at is required"))
         end
@@ -443,7 +443,7 @@ describe "Avram::SaveOperation" do
         user = UserQuery.new.first
         log_io = IO::Memory.new
         logger = Dexter::Logger.new(log_io)
-        Avram::Repo.temp_config(logger: logger) do |settings|
+        Avram.temp_config(logger: logger) do |settings|
           SaveUser.update(user, name: "") { |form, record| :unused }
           log_io.to_s.should contain(%("failed_to_save":"SaveUser","validation_errors":"name is required"))
         end

diff --git a/spec/spec_helper.cr b/spec/spec_helper.cr
@@ -1,11 +1,12 @@
 require "spec"
 require "../src/avram"
+require "./support/base_model"
 require "./support/**"
 require "../config/database"
 
 Db::Create.new.call
 Db::Migrate.new.call
 
 Spec.before_each do
-  Avram::Repo.truncate
+  TestDatabase.truncate
 end
diff --git a/spec/string_criteria_spec.cr b/spec/string_criteria_spec.cr
@@ -1,6 +1,6 @@
 require "./spec_helper"
 
-private class QueryMe < Avram::Model
+private class QueryMe < BaseModel
   COLUMN_SQL = "users.id, users.created_at, users.updated_at, users.name"
 
   table users do

diff --git a/spec/support/admin.cr b/spec/support/admin.cr
@@ -1,4 +1,4 @@
-class Admin < Avram::Model
+class Admin < BaseModel
   COLUMN_SQL = "admins.id, admins.created_at, admins.updated_at, admins.name"
 
   table do

diff --git a/spec/support/base_model.cr b/spec/support/base_model.cr
@@ -0,0 +1,5 @@
+class BaseModel < Avram::Model
+  def self.database
+    TestDatabase
+  end
+end
diff --git a/spec/support/blob.cr b/spec/support/blob.cr
@@ -1,4 +1,4 @@
-class Blob < Avram::Model
+class Blob < BaseModel
   table do
     column doc : JSON::Any?
   end

diff --git a/spec/support/business.cr b/spec/support/business.cr
@@ -1,19 +1,19 @@
-class Business < Avram::Model
+class Business < BaseModel
   table do
     column name : String
     has_one tax_id : TaxId
     has_one email_address : EmailAddress
   end
 end
 
-class TaxId < Avram::Model
+class TaxId < BaseModel
   table do
     column number : Int32
     belongs_to business : Business
   end
 end
 
-class EmailAddress < Avram::Model
+class EmailAddress < BaseModel
   table do
     column address : String
     belongs_to business : Business?

diff --git a/spec/support/comment.cr b/spec/support/comment.cr
@@ -1,4 +1,4 @@
-class Comment < Avram::Model
+class Comment < BaseModel
   skip_default_columns
 
   table do
@@ -9,7 +9,7 @@ class Comment < Avram::Model
   end
 end
 
-class CommentForCustomPost < Avram::Model
+class CommentForCustomPost < BaseModel
   skip_default_columns
 
   table :comments do

diff --git a/spec/support/company.cr b/spec/support/company.cr
@@ -1,4 +1,4 @@
-class Company < Avram::Model
+class Company < BaseModel
   table do
     column sales : Int64
     column earnings : Float64

diff --git a/spec/support/employee.cr b/spec/support/employee.cr
@@ -1,4 +1,4 @@
-class Employee < Avram::Model
+class Employee < BaseModel
   table do
     column name : String
     belongs_to manager : Manager?

diff --git a/spec/support/key_holder.cr b/spec/support/key_holder.cr
@@ -1,4 +1,4 @@
-class KeyHolder < Avram::Model
+class KeyHolder < BaseModel
   table :users do
     has_many sign_in_credentials : SignInCredential, foreign_key: :user_id
   end

diff --git a/spec/support/lazy_load_helpers.cr b/spec/support/lazy_load_helpers.cr
@@ -1,13 +1,13 @@
 module LazyLoadHelpers
   private def with_lazy_load(enabled)
     begin
-      Avram::Repo.configure do |settings|
+      Avram.configure do |settings|
         settings.lazy_load_enabled = enabled
       end
 
       yield
     ensure
-      Avram::Repo.configure do |settings|
+      Avram.configure do |settings|
         settings.lazy_load_enabled = true
       end
     end

diff --git a/spec/support/line_item.cr b/spec/support/line_item.cr
@@ -1,4 +1,4 @@
-class LineItem < Avram::Model
+class LineItem < BaseModel
   skip_default_columns
 
   table do

diff --git a/spec/support/line_item_product.cr b/spec/support/line_item_product.cr
@@ -1,4 +1,4 @@
-class LineItemProduct < Avram::Model
+class LineItemProduct < BaseModel
   skip_default_columns
 
   table :line_items_products do

diff --git a/spec/support/manager.cr b/spec/support/manager.cr
@@ -1,4 +1,4 @@
-class Manager < Avram::Model
+class Manager < BaseModel
   table do
     column name : String
     has_many employees : Employee

diff --git a/spec/support/menu_option.cr b/spec/support/menu_option.cr
@@ -1,4 +1,4 @@
-class MenuOption < Avram::Model
+class MenuOption < BaseModel
   skip_default_columns
 
   table do

diff --git a/spec/support/model_with_different_default_columns.cr b/spec/support/model_with_different_default_columns.cr
@@ -1,6 +1,6 @@
 # Different primary key name
 # No timestamps
-class ModelWithDifferentDefaultColumns < Avram::Model
+class ModelWithDifferentDefaultColumns < BaseModel
   skip_default_columns
 
   table :table_with_different_default_columns do

diff --git a/spec/support/post.cr b/spec/support/post.cr
@@ -1,4 +1,4 @@
-class Post < Avram::Model
+class Post < BaseModel
   skip_default_columns
 
   table do
@@ -16,7 +16,7 @@ end
 # This is a regular post, but with a custom table name
 # This is to test that 'belongs_to' can accept a 'table' in the
 # CommentForCustomPost model
-class PostWithCustomTable < Avram::Model
+class PostWithCustomTable < BaseModel
   skip_default_columns
 
   table :posts do

diff --git a/spec/support/price.cr b/spec/support/price.cr
@@ -1,4 +1,4 @@
-class Price < Avram::Model
+class Price < BaseModel
   skip_default_columns
 
   table do

diff --git a/spec/support/product.cr b/spec/support/product.cr
@@ -1,4 +1,4 @@
-class Product < Avram::Model
+class Product < BaseModel
   skip_default_columns
 
   table do

diff --git a/spec/support/scan.cr b/spec/support/scan.cr
@@ -1,4 +1,4 @@
-class Scan < Avram::Model
+class Scan < BaseModel
   skip_default_columns
 
   table do

diff --git a/spec/support/sign_in_credential.cr b/spec/support/sign_in_credential.cr
@@ -1,4 +1,4 @@
-class SignInCredential < Avram::Model
+class SignInCredential < BaseModel
   table do
     belongs_to user : User
   end

diff --git a/spec/support/tag.cr b/spec/support/tag.cr
@@ -1,4 +1,4 @@
-class Tag < Avram::Model
+class Tag < BaseModel
   skip_default_columns
 
   table do

diff --git a/spec/support/tagging.cr b/spec/support/tagging.cr
@@ -1,4 +1,4 @@
-class Tagging < Avram::Model
+class Tagging < BaseModel
   skip_default_columns
 
   table do