simple-sql 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24d06442bae77c5c1a51362e9ef1ac83e50034e6ce1b47b480ed8290f40e2b3
-  data.tar.gz: b2b0a88578e3c977ecf88739512d94a39bcbc8ce9eafac7225e02a925300ac9a
+  metadata.gz: 4f506a9925d4e81450d698169f04c60b69ca2191e1a353bbaa13b76a0ca48055
+  data.tar.gz: c2e9f14973dfdab36c1e49da800f4ae2e6e571e567338ebcc2be627f114938c3
 SHA512:
-  metadata.gz: 2ebd2eda811287cf9dbc8ec9deefb512aa7e5b02fbeb3d8c789d254958ff2d7148c16a65fb529ef672a7626f2e8871822493bb8444e602c112070b5be66f6aa5
-  data.tar.gz: bdfff2c6a865217aad9507ba6550b8122bc9f449a7cb8a09cc393ce97d75a60eec79a21f0edef183addc73e4378656e099b2ce84871f5a7e2b9721bbff670926
+  metadata.gz: 73d9bf9e990411871d8ed7d4f7a6a7d803aab52466387000441bcd777a35073ec6a6a9f5ff878e96e35d6ce469e5ddfcae5ec3de625b0024b5f6522dce1c8c9b
+  data.tar.gz: 75e21099aa4181e6fec9b7aa5919dd964ad271b4d20e0908f32de8fd7b6b150a7647162b946f376473303aa7d11bfc58a1132d91db19fa6a18f4f23a014bfd36

data/.gitignore

@@ -2,4 +2,8 @@ coverage
 rdoc
 pkg
 log/test.log
-.rspec.data
+.rspec.data
+Gemfile.lock
+.rake_t_cache
+.rspec.status
+simple-sql-0.4.10.gem

data/.tm_properties

@@ -0,0 +1,9 @@
+# Settings
+fontName         = "Menlo"
+fontSize         = 13
+fileBrowserGlob  = "{*,.tm_properties,.htaccess,}"
+excludeDirectories = "{node_modules,coverage,log,}"
+
+# Variables
+PATH             = "$PATH:$HOME/bin"
+TM_GIT           = "/opt/local/bin/git"

data/lib/simple/sql/reflection.rb

@@ -37,14 +37,8 @@ module Simple
       end
 
       def table_info(schema: "public")
-        columns = if schema == "public"
-                    "table_name AS name, *"
-                  else
-                    "table_schema || '.' || table_name AS name, *"
-                  end
-
         recs = all <<~SQL, schema, into: Hash
-          SELECT #{columns}
+          SELECT table_schema || '.' || table_name AS name, *
           FROM information_schema.tables
           WHERE table_schema=$1
           SQL

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

@@ -1,6 +1,7 @@
 # rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/ParameterLists
+# rubocop:disable Style/GuardClause
 
 #
 # This module implements a pretty generic AssociationLoader.
@@ -20,13 +21,13 @@ module ::Simple::SQL::Result::AssociationLoader # :nodoc:
   #
   # Raises an ArgumentError if no matching table can be found.
   def find_associated_table(association, schema:)
-    association = association.to_s
+    fq_association = "#{schema}.#{association}"
 
     tables_in_schema = ::Simple::SQL::Reflection.table_info(schema: schema).keys
 
-    return "#{schema}.#{association}"              if tables_in_schema.include?(association)
-    return "#{schema}.#{association.singularize}"  if tables_in_schema.include?(association.singularize)
-    return "#{schema}.#{association.pluralize}"    if tables_in_schema.include?(association.pluralize)
+    return fq_association              if tables_in_schema.include?(fq_association)
+    return fq_association.singularize  if tables_in_schema.include?(fq_association.singularize)
+    return fq_association.pluralize    if tables_in_schema.include?(fq_association.pluralize)
 
     raise ArgumentError, "Don't know how to find foreign table for association #{association.inspect}"
   end
@@ -46,6 +47,9 @@ module ::Simple::SQL::Result::AssociationLoader # :nodoc:
   # Raises an ArgumentError if no association can be found between these tables.
   #
   def find_matching_relation(host_table, associated_table)
+    expect! host_table => /^[^.]+.[^.]+$/
+    expect! associated_table => /^[^.]+.[^.]+$/
+
     sql = <<~SQL
       WITH foreign_keys AS(
         SELECT
@@ -67,10 +71,16 @@ module ::Simple::SQL::Result::AssociationLoader # :nodoc:
     SQL
 
     relations = SQL.all(sql, host_table, associated_table, into: :struct)
-    raise ArgumentError, "Found two potential matches for the #{association.inspect} relation" if relations.length > 1
-    raise ArgumentError, "Found no potential match for the #{association.inspect} relation" if relations.empty?
 
-    relations.first
+    return relations.first if relations.length == 1
+
+    description = "relation between #{host_table.inspect} and #{associated_table.inspect}"
+
+    if relations.empty?
+      raise "Didn't find any potential match for #{description}"
+    else
+      raise "Found two or more potential matches for #{description}"
+    end
   end
 
   # preloads a belongs_to association.

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

@@ -19,7 +19,6 @@ class ::Simple::SQL::Result::Records < ::Simple::SQL::Result::Rows
 
   AssociationLoader = ::Simple::SQL::Result::AssociationLoader
 
-
   # Preloads an association.
   #
   # This can now be used as follows:
@@ -45,7 +44,7 @@ class ::Simple::SQL::Result::Records < ::Simple::SQL::Result::Rows
     expect! as => [nil, Symbol]
 
     # resolve oid into table and schema name.
-    schema, host_table = SQL.ask <<~SQL, @pg_source_oid
+    schema, host_table = ::Simple::SQL.ask <<~SQL, @pg_source_oid
       SELECT nspname AS schema, relname AS host_table
       FROM pg_class
       JOIN pg_namespace ON pg_namespace.oid=pg_class.relnamespace

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.4.10"
+    VERSION = "0.4.11"
   end
 end

data/spec/simple/sql_reflection_spec.rb

@@ -13,7 +13,7 @@ describe "Simple::SQL::Reflection" do
 
   describe ".tables" do
     it "returns the tables in the public schema" do
-      expect(SQL::Reflection.tables).to include("users")
+      expect(SQL::Reflection.tables).to include("public.users")
     end
 
     it "returns tables in a non-'public' schema" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - radiospiel
@@ -173,8 +173,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".tm_properties"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console

data/Gemfile.lock

@@ -1,94 +0,0 @@
-PATH
-  remote: .
-  specs:
-    simple-sql (0.4.10)
-      expectation (~> 1)
-      pg (~> 0.20)
-      pg_array_parser (~> 0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.4)
-    ast (2.3.0)
-    awesome_print (0.4.0)
-    builder (3.2.3)
-    byebug (10.0.2)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.2)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    expectation (1.1.1)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    minitest (5.10.3)
-    parallel (1.10.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    pg (0.20.0)
-    pg_array_parser (0.0.9)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
-    rake (11.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.52.1)
-      parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4)
-  awesome_print (~> 0)
-  byebug
-  database_cleaner (~> 1)
-  pg (= 0.20)
-  rake (~> 11)
-  rspec (~> 3.7)
-  rubocop (~> 0.52.1)
-  simple-sql!
-  simplecov (~> 0)
-
-BUNDLED WITH
-   1.16.2