fx 0.8.0 → 0.10.0

data/spec/features/functions/migrations_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper"
 
-describe "Function migrations", :db do
+RSpec.describe "Function migrations", :db do
   around do |example|
-    sql_definition = <<-EOS
+    sql_definition = <<~SQL
       CREATE OR REPLACE FUNCTION test()
       RETURNS text AS $$
       BEGIN
           RETURN 'test';
       END;
       $$ LANGUAGE plpgsql;
-    EOS
+    SQL
     with_function_definition(name: :test, sql_definition: sql_definition) do
       example.run
     end
@@ -40,14 +40,14 @@ describe "Function migrations", :db do
   it "can run migrations that updates functions" do
     connection.create_function(:test)
 
-    sql_definition = <<-EOS
+    sql_definition = <<~SQL
       CREATE OR REPLACE FUNCTION test()
       RETURNS text AS $$
       BEGIN
           RETURN 'testest';
       END;
       $$ LANGUAGE plpgsql;
-    EOS
+    SQL
     with_function_definition(
       name: :test,
       version: 2,

data/spec/features/functions/revert_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper"
 
-describe "Reverting migrations", :db do
+RSpec.describe "Reverting migrations", :db do
   around do |example|
-    sql_definition = <<-EOS
+    sql_definition = <<~SQL
       CREATE OR REPLACE FUNCTION test()
       RETURNS text AS $$
       BEGIN
           RETURN 'test';
       END;
       $$ LANGUAGE plpgsql;
-    EOS
+    SQL
     with_function_definition(name: :test, sql_definition: sql_definition) do
       example.run
     end
@@ -50,14 +50,14 @@ describe "Reverting migrations", :db do
   it "can run reversible migrations for updating functions" do
     connection.create_function(:test)
 
-    sql_definition = <<-EOS
+    sql_definition = <<~SQL
       CREATE OR REPLACE FUNCTION test()
       RETURNS text AS $$
       BEGIN
         RETURN 'bar';
       END;
       $$ LANGUAGE plpgsql;
-    EOS
+    SQL
     with_function_definition(
       name: :test,
       version: 2,

data/spec/features/triggers/migrations_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper"
 
-describe "Trigger migrations", :db do
+RSpec.describe "Trigger migrations", :db do
   around do |example|
-    connection.execute <<-EOS
+    connection.execute <<~SQL
       CREATE TABLE users (
           id int PRIMARY KEY,
           name varchar(256),
           upper_name varchar(256)
       );
-    EOS
-    Fx.database.create_function <<-EOS
+    SQL
+    Fx.database.create_function <<~SQL
       CREATE OR REPLACE FUNCTION uppercase_users_name()
       RETURNS trigger AS $$
       BEGIN
@@ -17,13 +17,13 @@ describe "Trigger migrations", :db do
         RETURN NEW;
       END;
       $$ LANGUAGE plpgsql;
-    EOS
-    sql_definition = <<-EOS
+    SQL
+    sql_definition = <<~SQL
       CREATE TRIGGER uppercase_users_name
           BEFORE INSERT ON users
           FOR EACH ROW
           EXECUTE FUNCTION uppercase_users_name();
-    EOS
+    SQL
     with_trigger_definition(
       name: :uppercase_users_name,
       sql_definition: sql_definition

data/spec/features/triggers/revert_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper"
 
-describe "Reverting migrations", :db do
+RSpec.describe "Reverting migrations", :db do
   around do |example|
-    connection.execute <<-EOS
+    connection.execute <<~SQL
       CREATE TABLE users (
           id int PRIMARY KEY,
           name varchar(256),
           upper_name varchar(256)
       );
-    EOS
-    Fx.database.create_function <<-EOS
+    SQL
+    Fx.database.create_function <<~SQL
       CREATE OR REPLACE FUNCTION uppercase_users_name()
       RETURNS trigger AS $$
       BEGIN
@@ -17,13 +17,13 @@ describe "Reverting migrations", :db do
         RETURN NEW;
       END;
       $$ LANGUAGE plpgsql;
-    EOS
-    sql_definition = <<-EOS
+    SQL
+    sql_definition = <<~SQL
       CREATE TRIGGER uppercase_users_name
           BEFORE INSERT ON users
           FOR EACH ROW
           EXECUTE FUNCTION uppercase_users_name();
-    EOS
+    SQL
     with_trigger_definition(
       name: :uppercase_users_name,
       sql_definition: sql_definition
@@ -67,12 +67,12 @@ describe "Reverting migrations", :db do
   it "can run reversible migrations for updating triggers" do
     connection.create_trigger(:uppercase_users_name)
 
-    sql_definition = <<-EOS
+    sql_definition = <<~SQL
       CREATE TRIGGER uppercase_users_name
           BEFORE UPDATE ON users
           FOR EACH ROW
           EXECUTE FUNCTION uppercase_users_name();
-    EOS
+    SQL
     with_trigger_definition(
       name: :uppercase_users_name,
       sql_definition: sql_definition,

data/spec/fx/adapters/postgres/functions_spec.rb

@@ -1,37 +1,40 @@
 require "spec_helper"
 
-module Fx
-  module Adapters
-    describe Postgres::Functions, :db do
-      describe ".all" do
-        it "returns `Function` objects" do
-          connection = ActiveRecord::Base.connection
-          connection.execute <<-EOS.strip_heredoc
-            CREATE OR REPLACE FUNCTION test()
-            RETURNS text AS $$
-            BEGIN
-                RETURN 'test';
-            END;
-            $$ LANGUAGE plpgsql;
-          EOS
+RSpec.describe Fx::Adapters::Postgres::Functions, :db do
+  describe ".all" do
+    it "returns `Function` objects" do
+      connection = ActiveRecord::Base.connection
+      connection.execute <<~SQL
+        CREATE OR REPLACE FUNCTION test()
+        RETURNS text AS $$
+        BEGIN
+            RETURN 'test';
+        END;
+        $$ LANGUAGE plpgsql;
+      SQL
 
-          functions = Postgres::Functions.new(connection).all
+      functions = Fx::Adapters::Postgres::Functions.all(connection)
 
-          first = functions.first
-          expect(functions.size).to eq 1
-          expect(first.name).to eq "test"
-          expect(first.definition).to eq <<-EOS.strip_heredoc
-            CREATE OR REPLACE FUNCTION public.test()
-             RETURNS text
-             LANGUAGE plpgsql
-            AS $function$
-            BEGIN
-                RETURN 'test';
-            END;
-            $function$
-          EOS
-        end
-      end
+      first = functions.first
+      expect(functions.size).to eq(1)
+      expect(first.name).to eq("test")
+      expect(first.definition).to eq(<<~SQL)
+        CREATE OR REPLACE FUNCTION public.test()
+         RETURNS text
+         LANGUAGE plpgsql
+        AS $function$
+        BEGIN
+            RETURN 'test';
+        END;
+        $function$
+      SQL
+
+      connection.execute "CREATE SCHEMA IF NOT EXISTS other;"
+      connection.execute "SET search_path = 'other';"
+
+      functions = Fx::Adapters::Postgres::Functions.all(connection)
+
+      expect(functions).to be_empty
     end
   end
 end

data/spec/fx/adapters/postgres/query_executor_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+
+RSpec.describe Fx::Adapters::Postgres::QueryExecutor, :db do
+  it "executes the query and maps results to objects" do
+    connection = ActiveRecord::Base.connection
+    query = "SELECT 'Hello World' as message, 'english' as language"
+    greeter = Class.new do
+      attr_reader :message, :language
+
+      def initialize(row)
+        @message = row.fetch("message")
+        @language = row.fetch("language")
+      end
+    end
+
+    results = described_class.call(
+      connection: connection,
+      query: query,
+      model_class: greeter
+    )
+
+    expect(results.size).to eq(1)
+    expect(results.first).to be_a(greeter)
+    expect(results.first.message).to eq("Hello World")
+    expect(results.first.language).to eq("english")
+  end
+
+  it "executes query with multiple results" do
+    connection = ActiveRecord::Base.connection
+    query = <<~SQL
+      SELECT 'first' as name
+      UNION ALL
+      SELECT 'second' as name
+      ORDER BY name
+    SQL
+    simple_name = Class.new do
+      attr_reader :name
+
+      def initialize(row)
+        @name = row.fetch("name")
+      end
+    end
+
+    results = described_class.call(
+      connection: connection,
+      query: query,
+      model_class: simple_name
+    )
+
+    expect(results.size).to eq(2)
+    expect(results).to all(be_a(simple_name))
+    expect(results.first.name).to eq("first")
+    expect(results.last.name).to eq("second")
+  end
+
+  it "returns an empty array when query returns no results" do
+    connection = ActiveRecord::Base.connection
+    query = "SELECT 'test' as name WHERE 1 = 0"
+    simple_name = Class.new do
+      attr_reader :name
+
+      def initialize(row)
+        @name = row.fetch("name")
+      end
+    end
+
+    results = described_class.call(
+      connection: connection,
+      query: query,
+      model_class: simple_name
+    )
+
+    expect(results).to eq([])
+  end
+end

data/spec/fx/adapters/postgres/triggers_spec.rb

@@ -1,45 +1,48 @@
 require "spec_helper"
 
-module Fx
-  module Adapters
-    describe Postgres::Triggers, :db do
-      describe ".all" do
-        it "returns `Trigger` objects" do
-          connection = ActiveRecord::Base.connection
-          connection.execute <<-EOS.strip_heredoc
-            CREATE TABLE users (
-                id int PRIMARY KEY,
-                name varchar(256),
-                upper_name varchar(256)
-            );
-          EOS
-          connection.execute <<-EOS.strip_heredoc
-            CREATE OR REPLACE FUNCTION uppercase_users_name()
-            RETURNS trigger AS $$
-            BEGIN
-              NEW.upper_name = UPPER(NEW.name);
-              RETURN NEW;
-            END;
-            $$ LANGUAGE plpgsql;
-          EOS
-          connection.execute <<-EOS.strip_heredoc
-            CREATE TRIGGER uppercase_users_name
-                BEFORE INSERT ON users
-                FOR EACH ROW
-                EXECUTE FUNCTION uppercase_users_name();
-          EOS
+RSpec.describe Fx::Adapters::Postgres::Triggers, :db do
+  describe ".all" do
+    it "returns `Trigger` objects" do
+      connection = ActiveRecord::Base.connection
+      connection.execute <<~SQL
+        CREATE TABLE users (
+            id int PRIMARY KEY,
+            name varchar(256),
+            upper_name varchar(256)
+        );
+      SQL
+      connection.execute <<~SQL
+        CREATE OR REPLACE FUNCTION uppercase_users_name()
+        RETURNS trigger AS $$
+        BEGIN
+          NEW.upper_name = UPPER(NEW.name);
+          RETURN NEW;
+        END;
+        $$ LANGUAGE plpgsql;
+      SQL
+      connection.execute <<~SQL
+        CREATE TRIGGER uppercase_users_name
+            BEFORE INSERT ON users
+            FOR EACH ROW
+            EXECUTE FUNCTION uppercase_users_name();
+      SQL
 
-          triggers = Postgres::Triggers.new(connection).all
+      triggers = Fx::Adapters::Postgres::Triggers.all(connection)
 
-          first = triggers.first
-          expect(triggers.size).to eq 1
-          expect(first.name).to eq "uppercase_users_name"
-          expect(first.definition).to include("BEFORE INSERT")
-          expect(first.definition).to match(/ON [public.ser|]/)
-          expect(first.definition).to include("FOR EACH ROW")
-          expect(first.definition).to include("EXECUTE FUNCTION uppercase_users_name()")
-        end
-      end
+      first = triggers.first
+      expect(triggers.size).to eq(1)
+      expect(first.name).to eq("uppercase_users_name")
+      expect(first.definition).to include("BEFORE INSERT")
+      expect(first.definition).to match(/ON [public.ser|]/)
+      expect(first.definition).to include("FOR EACH ROW")
+      expect(first.definition).to include("EXECUTE FUNCTION uppercase_users_name()")
+
+      connection.execute "CREATE SCHEMA IF NOT EXISTS other;"
+      connection.execute "SET search_path = 'other';"
+
+      triggers = Fx::Adapters::Postgres::Triggers.all(connection)
+
+      expect(triggers).to be_empty
     end
   end
 end