simple-sql 0.2.10 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6970e8a68e60cb864a751516eab22b48cf747d13
-  data.tar.gz: f953e02ac5408f7ca1beed4a5247b109c526acf0
+  metadata.gz: c57a6e1295b2ce84040e5e0f8167aa83d367e0cf
+  data.tar.gz: 10527d7193cc63784a21ce703427f6e111fc9e39
 SHA512:
-  metadata.gz: 51cf095dc99c3e312273c8655bb2ef7ed6c7de8d50dd8241c870e688aeede9606eb4a96c1f52e0b27433be4b655314926dfeaadac73a0193ff505bcc4bfe0afe
-  data.tar.gz: 572250ea4fc3e22be6605932eba180988b188db195af51bd5eb330ddec72b078c4edab035ca1638745dcbc98f5ca7fa3fa0841682884c8d6f3f3f5131933e4aa
+  metadata.gz: b9254b98c19843789d4ec814047316caefe96a020c3393d686ba5dcc4faac2aafcab638d01f1a04dce4286e676674a55fc7d5668d965a3452c68e80330e836ff
+  data.tar.gz: 3e662b58ff18e2608f3005d8f53c55e445dce91d8cd02011dcde2292d461e264b93bf0cabc7b54d12ec6df9ad84e11ade46bff5021f5e20c3d5c041a5a85d8d0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.2.10)
+    simple-sql (0.3.0)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 

data/lib/simple/sql.rb

@@ -25,12 +25,13 @@ module Simple
     end
 
     def default_logger
-      logger = ActiveRecord::Base.logger if defined?(ActiveRecord)
-      return logger if logger
-
-      logger = Logger.new(STDERR)
-      logger.level = Logger::INFO
-      logger
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.logger
+      else
+        logger = Logger.new(STDERR)
+        logger.level = Logger::INFO
+        logger
+      end
     end
 
     # execute one or more sql statements. This method does not allow to pass in

data/lib/simple/sql/duplicate.rb

@@ -1,89 +1,41 @@
-# rubocop:disable Style/StructInheritance
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/AbcSize
 
 module Simple
   module SQL
-    class Fragment < Struct.new(:to_sql)
-    end
-
-    def fragment(str)
-      Fragment.new(str)
-    end
-
-    #
-    # Creates duplicates of record in a table.
-    #
-    # This method handles timestamp columns (these will be set to the current
-    # time) and primary keys (will be set to NULL.) You can pass in overrides
-    # as a third argument for specific columns.
-    #
-    # Parameters:
-    #
-    # - ids: (Integer, Array<Integer>) primary key ids
-    # - overrides: Hash[column_names => SQL::Fragment]
-    #
-    def duplicate(table, ids, overrides = {})
+    def duplicate(table, ids, except: [])
       ids = Array(ids)
       return [] if ids.empty?
 
-      Duplicator.new(table, overrides).call(ids)
-    end
-
-    class Duplicator
-      attr_reader :table_name, :custom_overrides
-
-      def initialize(table_name, overrides)
-        @table_name = table_name
-        @custom_overrides = validated_overrides(overrides)
-      end
-
-      def call(ids)
-        Simple::SQL.all query, ids
-      rescue PG::UndefinedColumn => e
-        raise ArgumentError, e.message
-      end
-
-      private
-
-      # This stringify all keys of the overrides hash, and verifies that
-      # all values in there are SQL::Fragments
-      def validated_overrides(overrides)
-        overrides.inject({}) do |hsh, (key, value)|
-          raise ArgumentError, "Unknown value #{value.inspect}" unless value.is_a?(Fragment)
-          hsh.update key.to_s => value.to_sql
-        end
-      end
+      timestamp_columns = Reflection.timestamp_columns(table)
+      primary_key_columns = Reflection.primary_key_columns(table)
 
-      def timestamp_overrides
-        Reflection.timestamp_columns(table_name).inject({}) do |hsh, column|
-          hsh.update column => "now() AS #{column}"
-        end
-      end
+      # duplicate all columns in the table that need to be SELECTed.
+      #
+      columns_to_dupe = Reflection.columns(table)
 
-      def copy_columns
-        (Reflection.columns(table_name) - Reflection.primary_key_columns(table_name)).inject({}) do |hsh, column|
-          hsh.update column => column
-        end
-      end
+      # Primary keys will not be selected from the table, they should be set
+      # automatically by the database, via a DEFAULT role on the column.
+      columns_to_dupe -= primary_key_columns
 
-      # build SQL query
-      def query
-        sources = {}
+      # timestamp_columns will not be selected from the table, they will be
+      # set to now() explicitely.
+      columns_to_dupe -= timestamp_columns
 
-        sources.update copy_columns
-        sources.update timestamp_overrides
-        sources.update custom_overrides
+      # If some other columns must be excluded they have to be added in the
+      # except: keyword argument. This is helpful for UNIQUE columns, but
+      # a column which is supposed to be UNIQUE and NOT NULL can not be dealt
+      # with.
+      columns_to_dupe -= except.map(&:to_s)
 
-        # convert into an Array, to make sure that keys and values aka firsts
-        # and lasts are always in the correct order.
-        sources = sources.to_a
+      # build query
+      select_columns = columns_to_dupe + timestamp_columns
+      select_values  = columns_to_dupe + timestamp_columns.map { |col| "now() AS #{col}" }
 
-        <<~SQL
-          INSERT INTO #{table_name}(#{sources.map(&:first).join(', ')})
-            SELECT #{sources.map(&:last).join(', ')}
-            FROM #{table_name}
-            WHERE id = ANY($1) RETURNING id
-        SQL
-      end
+      Simple::SQL.all <<~SQL, ids
+        INSERT INTO #{table}(#{select_columns.join(', ')})
+        SELECT #{select_values.join(', ')} FROM #{table} WHERE id = ANY($1) RETURNING id
+      SQL
     end
   end
 end

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.2.10"
+    VERSION = "0.3.0"
   end
 end

data/spec/simple/sql_duplicate_spec.rb

@@ -10,24 +10,24 @@ describe "Simple::SQL.duplicate" do
   end
 
   it "does not fail on a non-existing user" do
-    dupe_ids = SQL.duplicate "users", -1
+    dupe_ids = SQL.duplicate "users", source_ids.first
 
-    expect(dupe_ids.length).to eq(0)
-    expect(SQL.ask("SELECT COUNT(*) FROM users")).to eq(USER_COUNT)
+    expect(dupe_ids.length).to eq(1)
+    expect(SQL.ask("SELECT COUNT(*) FROM users")).to eq(3)
   end
 
   it "duplicates a single user" do
     dupe_ids = SQL.duplicate "users", source_ids.first
 
     expect(dupe_ids.length).to eq(1)
-    expect(SQL.ask("SELECT COUNT(*) FROM users")).to eq(1 + USER_COUNT)
+    expect(SQL.ask("SELECT COUNT(*) FROM users")).to eq(3)
   end
 
   it "duplicates many users" do
     dupe_ids = SQL.duplicate "users", (source_ids + [ -10 ])
 
     expect(dupe_ids.length).to eq(2)
-    expect(SQL.ask("SELECT COUNT(*) FROM users")).to eq(2 + USER_COUNT)
+    expect(SQL.ask("SELECT COUNT(*) FROM users")).to eq(4)
   end
 
   it "updates the timestamp columns" do

data/spec/simple/sql_insert_spec.rb

@@ -15,6 +15,11 @@ describe "Simple::SQL.insert" do
     expect(user.first_name).to eq("foo")
     expect(user.last_name).to eq("bar")
     expect(user.created_at).to be_a(Time)
+
+    #
+    # r = SQL.record("SELECT COUNT(*) AS count FROM users")
+    # r = SQL.record("SELECT COUNT(*) AS count FROM users")
+    # expect(r).to eq({count: 2})
   end
 end
 

data/spec/support/001_database.rb

@@ -35,13 +35,4 @@ ActiveRecord::Schema.define do
 
     t.timestamps null: true
   end
-
-  create_table :unique_users, force: true do |t|
-    t.string    :first_name
-    t.string    :last_name
-  end
-
-  execute <<-SQL
-  CREATE UNIQUE INDEX unique_users_ix1 ON unique_users(first_name, last_name)
-  SQL
 end

data/spec/support/factories/user_factory.rb

@@ -1,14 +1,8 @@
 FactoryGirl.define do
   factory :user do
     role_id         123
-
-    sequence :first_name do |n| "First #{n}" end
-    sequence :last_name  do |n| "Last #{n}"  end
+    first_name      "Uni"
+    last_name       "Corn"
     access_level    "viewable"
   end
-
-  factory :unique_user do
-    sequence :first_name do |n| "First #{n}" end
-    sequence :last_name  do |n| "Last #{n}"  end
-  end
 end

data/spec/support/model/user.rb

@@ -1,5 +1,2 @@
 class User < ActiveRecord::Base
 end
-
-class UniqueUser < ActiveRecord::Base
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -198,7 +198,6 @@ files:
 - spec/simple/sql_config_spec.rb
 - spec/simple/sql_conversion_spec.rb
 - spec/simple/sql_duplicate_spec.rb
-- spec/simple/sql_duplicate_unique_spec.rb
 - spec/simple/sql_insert_spec.rb
 - spec/simple/sql_record_spec.rb
 - spec/simple/sql_reflection_spec.rb
@@ -239,7 +238,6 @@ test_files:
 - spec/simple/sql_config_spec.rb
 - spec/simple/sql_conversion_spec.rb
 - spec/simple/sql_duplicate_spec.rb
-- spec/simple/sql_duplicate_unique_spec.rb
 - spec/simple/sql_insert_spec.rb
 - spec/simple/sql_record_spec.rb
 - spec/simple/sql_reflection_spec.rb

data/spec/simple/sql_duplicate_unique_spec.rb

@@ -1,37 +0,0 @@
-require "spec_helper"
-
-describe "Simple::SQL.duplicate/unique indices" do
-  let!(:unique_users) { 1.upto(USER_COUNT).map { create(:unique_user) } }
-
-  let!(:source_ids) { SQL.all("SELECT id FROM unique_users") }
-
-  it "cannot duplicate unique_user" do
-    expect {
-      SQL.duplicate "unique_users", source_ids
-    }.to raise_error(PG::UniqueViolation)
-  end
-
-  it "raises an ArgumentError when called with unknown columns" do
-    expect {
-      SQL.duplicate "unique_users", source_ids, foo: SQL.fragment("baz")
-    }.to raise_error(ArgumentError)
-  end
-
-  it "raises an ArgumentError when called with invalid overrides" do
-    expect {
-      SQL.duplicate "unique_users", source_ids, first_name: "I am invalid"
-    }.to raise_error(ArgumentError)
-  end
-
-  it "duplicates unique_users" do
-    overrides = {
-      first_name:  SQL.fragment("first_name || '.' || id"),
-      last_name:   SQL.fragment("last_name || '.' || id")
-    }
-
-    dupe_ids = SQL.duplicate "unique_users", source_ids, overrides
-
-    expect(dupe_ids.length).to eq(2)
-    expect(SQL.ask("SELECT COUNT(*) FROM unique_users")).to eq(4)
-  end
-end