insert_select 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed398397217cbd7d7a636948b89a3cfb32bbfa6c9288619e249e014f895febc
-  data.tar.gz: 015b72e911c1183215858260e3aa96dc6ec47000f2221ec7c7147929deb94167
+  metadata.gz: 5f35ad1a5ba6691ef951e0b312f72a88f9cf1f63a3c78d365ba609ce328cffb4
+  data.tar.gz: 8d9bdf2e2096814a94d483e156e99e315fbac5f82ae5bc06df57715afd9f36ec
 SHA512:
-  metadata.gz: 9b5ec0d676bb246917b348e656bcb20b89ea4fdb509ae834dc1f32704f2c8faa97a8ce394b6629deb26001f06cdc59550c01c78f49febbb94e936cc1ec88d9a1
-  data.tar.gz: 5179a2af5b2b62670f42f1b1fec76f9c38cfc2c9d025e82de60b4d5f6e3a16df27096992896533abf25759b8423dc68afce0939e09b1486392022e74168b50fe
+  metadata.gz: ada0f0f8289682ac790410639eaeca097cdf95ae3d1345b4ccadc0e3ec0133cef30b4c966223d29f6212047b5ab78f59d14f3032b6bf98ac9e8c0d6abb2760d6
+  data.tar.gz: 60f34464bab7946821a59620bcee6250407e674e54320a91f0f3310472ac81832159a7ecd684c1f13845f43677695b35de90102819e00e307fee03876b8e8eef

data/Gemfile

@@ -9,3 +9,5 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 gem "sqlite3"
+gem "mysql2"
+gem "pg"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    insert_select (0.1.0)
+    insert_select (1.0.1)
       activerecord
 
 GEM
@@ -22,6 +22,8 @@ GEM
     i18n (1.14.0)
       concurrent-ruby (~> 1.0)
     minitest (5.18.0)
+    mysql2 (0.5.5)
+    pg (1.5.3)
     rake (13.0.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -48,6 +50,8 @@ PLATFORMS
 
 DEPENDENCIES
   insert_select!
+  mysql2
+  pg
   rake (~> 13.0)
   rspec (~> 3.0)
   sqlite3

data/README.md

@@ -2,7 +2,8 @@
 [![Ruby](https://github.com/a5-stable/insert_select/actions/workflows/ruby.yml/badge.svg)](https://github.com/a5-stable/insert_select/actions/workflows/ruby.yml)
 ![Code Climate](https://codeclimate.com/github/a5-stable/insert_select.png)
 
-This is a custom gem that extends ActiveRecord to enable the expression of SQL `INSERT INTO ... SELECT ...` queries in a more convenient way. It allows you to copy data from one table to another based on specified conditions using a simple and expressive syntax.
+This is a custom gem that extends ActiveRecord to enable the expression of SQL `INSERT INTO ... SELECT ...` queries in a more convenient way.  
+It allows you to copy data from one table to another based on specified conditions using a simple and expressive syntax.
 
 SQL example of `INSERT INTO ... SELECT ...`:
 ```
@@ -33,7 +34,7 @@ gem install insert_select
   
 ## Usage
 
-### Copy all data from OldUser to NewUser
+#### Copy all data from OldUser to NewUser
 
 ```ruby
 NewUser.insert_select_from(OldUser)
@@ -41,7 +42,7 @@ NewUser.insert_select_from(OldUser)
 #=> INSERT INTO "new_users" SELECT "old_users".* FROM "old_users"
 ```
 
-### Filter the columns to be copied
+#### Filter the columns to be copied
 
 ```ruby
 NewUser.insert_select_from(OldUser.select(:name))
@@ -49,7 +50,7 @@ NewUser.insert_select_from(OldUser.select(:name))
 #=> INSERT INTO "new_users" ("name") SELECT "old_users"."name" FROM "old_users"
 ```
 
-### Copy data between different column names
+#### Copy data between different column names
 
 You can specify column name mappings between tables.
 ```ruby
@@ -58,28 +59,43 @@ AnotherUser.insert_select_from(OldUser, mapping: { old_name: :another_name })
 #=> INSERT INTO "another_users" ("another_name") SELECT "old_users"."name" FROM "old_users"
 ```
 
-### Set a constant value
+#### Set a constant value
 ```ruby
 AnotherUser.create_with(another_constant_column: "20").insert_select_from(OldUser, mapping: { old_name: :another_name })
 
 #=> INSERT INTO "another_users" ("another_name", "another_constant_column") SELECT "old_users"."name", "20" FROM "old_users"
 ```
 
-### Use a WHERE clause to filter the data
+#### Use a WHERE clause to filter the data
 ```ruby
 NewUser.insert_select_from(OldUser.where("age > ?", 20))
 
 #=> INSERT INTO "new_users" SELECT "old_users".*, FROM "old_users" WHERE ("age" > 20)
 ```
 
-### Use the RETURNING clause (only for PostgreSQL connection)
+#### Use the RETURNING clause (only for PostgreSQL connection)
 ```ruby
 NewUser.insert_select_from(OldUser, returning: [:id])
 
 #=> INSERT INTO "new_users" SELECT "old_users".* FROM "old_users" RETURNING "id"
 ```
+#### Bang method
+In default, any duplicated records are skipped in the `insert_select_from` method.
+If you want to raise an error when a duplicated record is found, use the bang method.
+
+Assume that `id` is a primary key.
+This example does not raise an `ActiveRecord::RecordNotUnique` exception and no record is inserted.
+```ruby
+User.insert_select_from(User)
+```
+
+This example raises an `ActiveRecord::RecordNotUnique` exception.
+```ruby
+User.insert_select_from!(User)
+
+#=> ActiveRecord::RecordNotUnique (SQLite3::ConstraintException: UNIQUE constraint failed: users.id)
+```
 
-Other options, which are enabled in [`insert_all`](https://www.rubydoc.info/github/rails/rails/ActiveRecord%2FPersistence%2FClassMethods:insert_all) should be also supported, but are not yet implemented.
 
 ## Development
 

data/Rakefile

@@ -5,4 +5,15 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
+namespace :spec do
+  ["postgresql", "mysql2", "sqlite3"].each do |adapter|
+    RSpec::Core::RakeTask.new(adapter) do |t|
+      ENV["ADAPTER_NAME"] = adapter 
+      ENV["DATABASE_NAME"] = adapter == "sqlite3" ? ":memory:" : "insert_select_test"
+      t.pattern = FileList["spec/*_spec.rb"]
+    end
+  end
+end
+
+task spec: ["spec:postgresql", "spec:mysql2", "spec:sqlite3"]
 task default: :spec

data/lib/insert_select/active_record.rb

@@ -34,7 +34,11 @@ module InsertSelect
         # @return [ActiveRecord::Result] The result of the insert select operation.
         #
         def insert_select_from(relation, mapping: {}, returning: nil)
-          InsertSelect::ActiveRecord::InsertSelectFrom.new(self, relation, mapping: mapping, returning: returning).execute
+          InsertSelect::ActiveRecord::InsertSelectFrom.new(self, relation, mapping: mapping, on_duplicate: :skip, returning: returning).execute
+        end
+
+        def insert_select_from!(relation, mapping: {}, returning: nil)
+          InsertSelect::ActiveRecord::InsertSelectFrom.new(self, relation, mapping: mapping, on_duplicate: :raise, returning: returning).execute
         end
 
         def except(*columns)
@@ -44,20 +48,21 @@ module InsertSelect
     end
 
     class InsertSelectFrom
-      attr_reader :model, :connection, :relation, :adapter, :mapping, :returning
+      attr_reader :model, :connection, :relation, :adapter, :mapping, :returning, :on_duplicate
 
-      def initialize(model, relation, mapping:, returning: nil)
+      def initialize(model, relation, mapping:, on_duplicate:, returning: nil)
         @model = model
         @connection = model.connection
         @relation = relation
         @adapter = find_adapter(connection)
         @mapping = mapping
         @returning = returning
+        @on_duplicate = on_duplicate
       end
 
       def execute
         sql = model.sanitize_sql_array([to_sql, *builder.constant_values])
-        connection.exec_insert_all(sql, "")
+        connection.exec_insert_all(sql, "Bulk Insert")
       end
 
       def to_sql

data/lib/insert_select/adapters/mysql_adapter.rb

@@ -7,7 +7,13 @@ module InsertSelect
       end
 
       def build_sql(builder)
-        super
+        stmt = super
+
+        if builder.on_duplicate == :skip
+          stmt << " ON DUPLICATE KEY UPDATE `id`= VALUES(`id`) " 
+        end
+
+        stmt
       end
     end
   end

data/lib/insert_select/adapters/postgresql_adapter.rb

@@ -7,10 +7,12 @@ module InsertSelect
       end
 
       def build_sql(builder)
-        sql = super
-        sql += " RETURNING #{builder.returning}" if builder.returning
+        stmt = super
 
-        sql
+        stmt << " ON CONFLICT DO NOTHING" if builder.on_duplicate == :skip
+        stmt << " RETURNING #{builder.returning}" if builder.returning?
+
+        stmt
       end
     end
   end

data/lib/insert_select/adapters/sqlite_adapter.rb

@@ -7,7 +7,18 @@ module InsertSelect
       end
 
       def build_sql(builder)
-        super
+        # have to be done before we call super, because super will make relation immutable
+        if builder.on_duplicate == :skip
+          builder.relation.where!("TRUE") if builder.relation.where_clause.blank?
+        end
+
+        stmt = super
+
+        if builder.on_duplicate == :skip
+          stmt << " ON CONFLICT DO NOTHING" 
+        end
+
+        stmt
       end
     end
   end

data/lib/insert_select/builder.rb

@@ -1,7 +1,7 @@
 module InsertSelect
   module ActiveRecord
     class Builder
-      attr_reader :relation, :mapping, :model, :returning, :insert_select_from, :connection
+      attr_reader :relation, :mapping, :model,:insert_select_from, :connection, :returning, :on_duplicate
 
       def initialize(insert_select_from)
         @insert_select_from = insert_select_from
@@ -10,6 +10,7 @@ module InsertSelect
         @mapping = insert_select_from.mapping || {}
         @model = insert_select_from.model
         @returning = insert_select_from.returning
+        @on_duplicate = insert_select_from.on_duplicate
       end
 
       def mapper
@@ -58,7 +59,10 @@ module InsertSelect
       end
 
       def constant_values
-        constant_mapping.values
+        constant_mapping.map do |k, v|
+          type = model.type_for_attribute(k.to_s)
+          type.serialize(v)
+        end
       end
 
       def reselect_relation!
@@ -90,6 +94,10 @@ module InsertSelect
         end
       end
 
+      def returning?
+        @returning.present?
+      end
+
       private
 
       def remove_select_values!(column_name)

data/lib/insert_select/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InsertSelect
-  VERSION = "0.1.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insert_select
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - a5-stable
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord