simple-sql 0.4.21 → 0.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 333ad2e3a74fd8e625a0704efd36e444f5f7798d2dd9c47a5a71dbf0db67acb9
-  data.tar.gz: 12b24d2fc0a760189dfc47a45de4a4a1ce1ed84419301eb5162938ef3db7126d
+  metadata.gz: 58caff3c654cc1f068e15d93f2d356fde5598e159ddd2589aeb5e5588a1e8c16
+  data.tar.gz: d9d06f994b53824b937872c548601c025a93060c917602a73e99d8a8ab24dbdd
 SHA512:
-  metadata.gz: f30c396c7b81e5e754e9f19335f6083a515a0892f1aea65f528c7e075d2714164fc7c325ae5c478d04449b28e8fce3cbf96bc000d895da29dd3c304779c38a4f
-  data.tar.gz: 30448b8eea1a67ed03725d25e0b242e18cb866a82031414a94d4f9751a3f9875d6928eb2ed9f728f52dd65f3268f988661710e6cc204afdeca89c303ae492d23
+  metadata.gz: af6166f4600345b8151092e3f2198f89defb2d64365a3e0d616b2da86ef87a73ba7b6ed360e3c4dd4371569afa70e210ef72bdbbabd25e5b87f685cc0d7c99ef
+  data.tar.gz: e04ef18bd368c7e2e404daf84767204335de2f85ee22594d56bd37415b085e6dc78417cd46d5e085e134493d2cb0d09318da8665a8695a1333a6e89a7c24af7c

data/.gitignore

@@ -6,4 +6,4 @@ log/test.log
 Gemfile.lock
 .rake_t_cache
 .rspec.status
-simple-sql-0.4.10.gem
+.DS_Store

data/lib/simple/sql/helpers/decoder.rb

@@ -4,12 +4,6 @@ require "time"
 module Simple::SQL::Helpers::Decoder
   extend self
 
-  def parse_timestamp(s)
-    r = ::Time.parse(s)
-    return r if r.utc_offset == 0
-    Time.gm(r.year, r.mon, r.day, r.hour, r.min, r.sec, r.usec)
-  end
-
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/CyclomaticComplexity
   def decode_value(type, s)
@@ -23,7 +17,8 @@ module Simple::SQL::Helpers::Decoder
     when :'integer[]'                   then s.scan(/-?\d+/).map { |part| Integer(part) }
     when :"character varying[]"         then parse_pg_array(s)
     when :"text[]"                      then parse_pg_array(s)
-    when :"timestamp without time zone" then parse_timestamp(s)
+    when :"timestamp without time zone" then ::Time.parse(s)
+    when :"timestamp with time zone"    then ::Time.parse(s)
     when :hstore                        then HStore.parse(s)
     when :json                          then ::JSON.parse(s)
     when :jsonb                         then ::JSON.parse(s)

data/lib/simple/sql/insert.rb

@@ -7,20 +7,20 @@ module Simple
     # - records - a single hash of attributes or an array of hashes of attributes
     # - on_conflict - uses a postgres ON CONFLICT clause to ignore insert conflicts if true
     #
-    def insert(table, records, on_conflict: nil)
+    def insert(table, records, on_conflict: nil, into: nil)
       if records.is_a?(Hash)
-        insert_many(table, [records], on_conflict).first
+        insert_many(table, [records], on_conflict, into).first
       else
-        insert_many(table, records, on_conflict)
+        insert_many(table, records, on_conflict, into)
       end
     end
 
     private
 
-    def insert_many(table, records, on_conflict)
+    def insert_many(table, records, on_conflict, into)
       return [] if records.empty?
 
-      inserter = Inserter.create(table_name: table.to_s, columns: records.first.keys, on_conflict: on_conflict)
+      inserter = Inserter.create(table_name: table.to_s, columns: records.first.keys, on_conflict: on_conflict, into: into)
       inserter.insert(records: records)
     end
 
@@ -29,16 +29,19 @@ module Simple
 
       @@inserters = {}
 
-      def self.create(table_name:, columns:, on_conflict:)
-        @@inserters[[table_name, columns, on_conflict]] ||= new(table_name: table_name, columns: columns, on_conflict: on_conflict)
+      def self.create(table_name:, columns:, on_conflict:, into:)
+        expect! on_conflict => CONFICT_HANDLING.keys
+
+        @@inserters[[table_name, columns, on_conflict, into]] ||= new(table_name: table_name, columns: columns, on_conflict: on_conflict, into: into)
       end
 
       #
       # - table_name - the name of the table
       # - columns - name of columns, as Array[String] or Array[Symbol]
       #
-      def initialize(table_name:, columns:, on_conflict:)
+      def initialize(table_name:, columns:, on_conflict:, into:)
         @columns = columns
+        @into = into
 
         cols = []
         vals = []
@@ -51,7 +54,9 @@ module Simple
         cols += timestamp_columns
         vals += timestamp_columns.map { "now()" }
 
-        @sql = "INSERT INTO #{table_name} (#{cols.join(',')}) VALUES(#{vals.join(',')}) #{confict_handling(on_conflict)} RETURNING id"
+        returning = into ? '*' : "id"
+
+        @sql = "INSERT INTO #{table_name} (#{cols.join(',')}) VALUES(#{vals.join(',')}) #{confict_handling(on_conflict)} RETURNING #{returning}"
       end
 
       CONFICT_HANDLING = {
@@ -69,7 +74,7 @@ module Simple
       def insert(records:)
         SQL.transaction do
           records.map do |record|
-            SQL.ask @sql, *record.values_at(*@columns)
+            SQL.ask @sql, *record.values_at(*@columns), into: @into
           end
         end
       end

data/lib/simple/sql/result/association_loader.rb

@@ -3,6 +3,8 @@
 # rubocop:disable Metrics/ParameterLists
 # rubocop:disable Style/GuardClause
 
+require "active_support/core_ext/string/inflections"
+
 #
 # This module implements a pretty generic AssociationLoader.
 #
@@ -52,7 +54,7 @@ module ::Simple::SQL::Result::AssociationLoader # :nodoc:
 
     sql = <<~SQL
       WITH foreign_keys AS(
-        SELECT
+        SELECT DISTINCT
           tc.table_schema || '.' || tc.table_name   AS belonging_table,
           kcu.column_name                           AS belonging_column,
           ccu.table_schema || '.' || ccu.table_name AS having_table,

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.4.21"
+    VERSION = "0.4.22"
   end
 end

data/scripts/watch

@@ -1,2 +1,2 @@
 #!/bin/bash
-watchr lib,spec 'rspec --only-failures ; [[ $? == 2 ]] && rspec'
+watchr lib,spec rspec $@

data/spec/simple/{sql_insert_spec.rb → sql/insert_spec.rb}

@@ -3,18 +3,32 @@ require "spec_helper"
 describe "Simple::SQL.insert" do
   let!(:users) { 1.upto(USER_COUNT).map { create(:user) } }
 
-  it "inserts a single user" do
-    initial_ids = SQL.all("SELECT id FROM users")
-
-    id = SQL.insert :users, first_name: "foo", last_name: "bar"
-    expect(id).to be_a(Integer)
-    expect(initial_ids).not_to include(id)
-    expect(SQL.ask("SELECT count(*) FROM users")).to eq(USER_COUNT+1)
-
-    user = SQL.ask("SELECT * FROM users WHERE id=$1", id, into: OpenStruct)
-    expect(user.first_name).to eq("foo")
-    expect(user.last_name).to eq("bar")
-    expect(user.created_at).to be_a(Time)
+  context "when inserting a user" do
+    let!(:initial_ids) { SQL.all("SELECT id FROM users") }
+
+    it "inserts a single user" do
+      id = SQL.insert :users, first_name: "foo", last_name: "bar"
+      expect(id).to be_a(Integer)
+      expect(initial_ids).not_to include(id)
+      expect(SQL.ask("SELECT count(*) FROM users")).to eq(USER_COUNT+1)
+
+      user = SQL.ask("SELECT * FROM users WHERE id=$1", id, into: OpenStruct)
+      expect(user.first_name).to eq("foo")
+      expect(user.last_name).to eq("bar")
+      expect(user.created_at).to be_a(Time)
+    end
+
+    it "returns the id" do
+      id = SQL.insert :users, first_name: "foo", last_name: "bar"
+      expect(id).to be_a(Integer)
+      expect(initial_ids).not_to include(id)
+    end
+
+    it "returns the record as a Hash" do
+      rec = SQL.insert :users, { first_name: "foo", last_name: "bar" }, into: Hash
+      expect(rec).to be_a(Hash)
+      expect(rec).to include(first_name: "foo", last_name: "bar")
+    end
   end
 
   describe 'confict handling' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.22
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -206,17 +206,17 @@ files:
 - scripts/watch
 - simple-sql.gemspec
 - spec/manual/threadtest.rb
+- spec/simple/sql/all_into_spec.rb
+- spec/simple/sql/ask_spec.rb
+- spec/simple/sql/associations_spec.rb
+- 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/reflection_spec.rb
+- spec/simple/sql/scope_spec.rb
 - spec/simple/sql/version_spec.rb
-- spec/simple/sql_all_into_spec.rb
-- spec/simple/sql_ask_spec.rb
-- spec/simple/sql_associations_spec.rb
-- 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_reflection_spec.rb
-- spec/simple/sql_scope_spec.rb
 - spec/spec_helper.rb
 - spec/support/001_database.rb
 - spec/support/002_database_cleaner.rb
@@ -249,17 +249,17 @@ specification_version: 4
 summary: SQL with a simple interface
 test_files:
 - spec/manual/threadtest.rb
+- spec/simple/sql/all_into_spec.rb
+- spec/simple/sql/ask_spec.rb
+- spec/simple/sql/associations_spec.rb
+- 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/reflection_spec.rb
+- spec/simple/sql/scope_spec.rb
 - spec/simple/sql/version_spec.rb
-- spec/simple/sql_all_into_spec.rb
-- spec/simple/sql_ask_spec.rb
-- spec/simple/sql_associations_spec.rb
-- 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_reflection_spec.rb
-- spec/simple/sql_scope_spec.rb
 - spec/spec_helper.rb
 - spec/support/001_database.rb
 - spec/support/002_database_cleaner.rb