simple-sql 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fea0396d5b98a9ec21ea6910bf6b68bc35aab90
-  data.tar.gz: bdfd6c5e2a4abbbc82cc86b3564de1c5649d4333
+  metadata.gz: cad4b0118fd0c649c4f6050f6f641245292e0b4d
+  data.tar.gz: 8e12a2a3b15218a02f3a2e7464aaec7ea84e39ae
 SHA512:
-  metadata.gz: 50cd39402330417cbf4e6f81ff9ad49cc15b1bf96f3a11772e57e677803dac734e898d1b44036e299bda343a54fc9d6b606351377589ceb8908bd3d69280a046
-  data.tar.gz: bb6482542f96b64c8b9a75c19421dbfe01953fa6cdc76e2bdee5aaabcbdea931d44a8c2cf184819b6630559d7bc30757dbec5f0c5002b00df92a7ed93943eeb0
+  metadata.gz: acf9fe4aacd51c3a34a34a92d45b339daa673f703d8e933f31e319057c571a3c1cae8b1d181ac8700d1953b18a8f5fd83ed57262e82415adedc662fd5701418c
+  data.tar.gz: 2078e081ab1d2110a1c582a1861d617a201d37ab76896ff05d8a9f5b9f01cc3630bd430a0ae070a48d8fbff473587b3aa775e52486f5f99fd9a2097a54afe11e

data/.rubocop.yml

@@ -33,3 +33,27 @@ Style/Documentation:
 
 Style/MutableConstant:
   Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Lint/MissingCopEnableDirective:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.2.6)
+    simple-sql (0.2.7)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 
@@ -90,4 +90,4 @@ DEPENDENCIES
   simplecov (~> 0)
 
 BUNDLED WITH
-   1.13.6
+   1.16.1

data/lib/simple/sql/config.rb

@@ -1,3 +1,8 @@
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/PerceivedComplexity
+
 # private
 module Simple::SQL::Config
   extend self
@@ -33,10 +38,10 @@ module Simple::SQL::Config
 
   def database_url_from_database_yml
     abc = read_database_yml
-    username, password, host, port, database, password = abc.values_at "username", "password", "host", "port", "database", "password"
+    username, password, host, port, database = abc.values_at "username", "password", "host", "port", "database"
 
-    username_and_password = [ username, password ].compact.join(":")
-    host_and_port = [ host, port ].compact.join(":")
+    username_and_password = [username, password].compact.join(":")
+    host_and_port = [host, port].compact.join(":")
     "postgres://#{username_and_password}@#{host_and_port}/#{database}"
   end
 
@@ -46,7 +51,7 @@ module Simple::SQL::Config
     env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
 
     database_config[env] ||
-    database_config["defaults"] ||
-    raise("Invalid or missing database configuration in config/database.yml for #{env.inspect} environment")
+      database_config["defaults"] ||
+      raise("Invalid or missing database configuration in config/database.yml for #{env.inspect} environment")
   end
 end

data/lib/simple/sql/connection.rb

@@ -1,3 +1,6 @@
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Style/IfUnlessModifier
+
 # private
 module Simple::SQL::Connection
   def self.new(connection)
@@ -18,7 +21,7 @@ module Simple::SQL::Connection
     extend Forwardable
     delegate %w(exec_params exec escape wait_for_notify) => :@raw_connection
 
-    def transaction(&block)
+    def transaction(&_block)
       raise ArgumentError, "Implementation missing for #transaction"
     end
   end
@@ -31,9 +34,9 @@ module Simple::SQL::Connection
 
     private
 
-    def transaction(&block)
-      # Notes: by using "ensure" (as opposed to rescue) we are rolling back 
-      # both when an exception was raised and when a value was thrown. This 
+    def transaction(&_block)
+      # Notes: by using "ensure" (as opposed to rescue) we are rolling back
+      # both when an exception was raised and when a value was thrown. This
       # also means we have to track whether or not to rollback. i.e. do roll
       # back when we yielded to &block but not otherwise.
       #
@@ -71,6 +74,6 @@ module Simple::SQL::Connection
       @connection = connection
     end
 
-    delegate :transaction => :@connection
+    delegate [:transaction] => :@connection
   end
 end

data/lib/simple/sql/decoder.rb

@@ -37,7 +37,7 @@ module Simple::SQL::Decoder
     else
       # unknown value, we just return the string here.
       # STDERR.puts "unknown type: #{type.inspect}"
-      s 
+      s
     end
   end
   # rubocop:enable Metrics/AbcSize

data/lib/simple/sql/insert.rb

@@ -1,11 +1,19 @@
+# rubocop:disable Style/ClassVars
+# rubocop:disable Metrics/AbcSize
+
 module Simple
   module SQL
-    # Inse
     def insert(table, records)
       if records.is_a?(Hash)
-        return insert(table, [records]).first
+        insert_many(table, [records]).first
+      else
+        insert_many table, records
       end
+    end
+
+    private
 
+    def insert_many(table, records)
       return [] if records.empty?
 
       inserter = Inserter.create(table_name: table.to_s, columns: records.first.keys)
@@ -32,20 +40,20 @@ module Simple
         vals = []
 
         cols += columns
-        vals += columns.each_with_index.map { |_, idx| "$#{idx+1}" }
+        vals += columns.each_with_index.map { |_, idx| "$#{idx + 1}" }
 
         timestamp_columns = timestamp_columns_in_table(table_name) - columns.map(&:to_s)
 
         cols += timestamp_columns
         vals += timestamp_columns.map { "now()" }
 
-        @sql = "INSERT INTO #{table_name} (#{cols.join(",")}) VALUES(#{vals.join(",")}) RETURNING id"
+        @sql = "INSERT INTO #{table_name} (#{cols.join(',')}) VALUES(#{vals.join(',')}) RETURNING id"
       end
 
       # timestamp_columns are columns that will be set to the current time when
       # inserting a record. This includes:
       #
-      # - inserted_at (for Ecto) 
+      # - inserted_at (for Ecto)
       # - created_at (for ActiveRecord)
       # - updated_at (for Ecto and ActiveRecord)
       def timestamp_columns_in_table(table_name)
@@ -53,7 +61,7 @@ module Simple
         columns_for_table & %w(inserted_at created_at updated_at)
       end
 
-      def insert(records: records)
+      def insert(records:)
         SQL.transaction do
           records.map do |record|
             SQL.ask @sql, *record.values_at(*@columns)

data/lib/simple/sql/logging.rb

@@ -1,17 +1,20 @@
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/LineLength
+
 module Simple
   module SQL
     module Logging
       extend self
 
-      def yield_logged(sql, *args, &block)
+      def yield_logged(sql, *args, &_block)
         r0 = Time.now
         rv = yield
         realtime = Time.now - r0
-        ::Simple::SQL.logger.debug "[sql] %.3f secs: %s" % [ realtime, format_query(sql, *args) ]
+        ::Simple::SQL.logger.debug "[sql] %.3f secs: %s" % [realtime, format_query(sql, *args)]
         rv
-      rescue => e
+      rescue StandardError => e
         realtime = Time.now - r0
-        ::Simple::SQL.logger.warn "[sql] %.3f secs: %s:\n\tfailed with error %s" % [ realtime, format_query(sql, *args), e.message ]
+        ::Simple::SQL.logger.warn "[sql] %.3f secs: %s:\n\tfailed with error %s" % [realtime, format_query(sql, *args), e.message]
         raise
       end
 
@@ -26,4 +29,3 @@ module Simple
     end
   end
 end
-

data/lib/simple/sql/reflection.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/MethodLength
+
 module Simple
   module SQL
     module Reflection
@@ -7,20 +9,17 @@ module Simple
       delegate [:ask, :all, :records, :record] => ::Simple::SQL
 
       def tables(schema: "public")
-        if schema == "public"
-          sql = <<~SQL
-            SELECT table_name AS name, *
-            FROM information_schema.tables
-            WHERE table_schema=$1
-          SQL
-        else
-          sql = <<~SQL
-            SELECT table_schema || '.' || table_name AS name, *
-            FROM information_schema.tables
-            WHERE table_schema=$1
+        select = if schema == "public"
+                   "table_name AS name, *"
+                 else
+                   "table_schema || '.' || table_name AS name, *"
+                 end
+
+        records = ::Simple::SQL.records <<~SQL, schema
+          SELECT #{select}
+          FROM information_schema.tables
+          WHERE table_schema=$1
           SQL
-        end
-        records = ::Simple::SQL.records sql, schema
         records_by_attr(records, :name)
       end
 
@@ -42,9 +41,9 @@ module Simple
       def parse_table_name(table_name)
         p1, p2 = table_name.split(".", 2)
         if p2
-          [ p1, p2 ]
+          [p1, p2]
         else
-          [ "public", p1 ]
+          ["public", p1]
         end
       end
 

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/lib/simple/sql.rb

@@ -16,7 +16,24 @@ module Simple
     extend self
 
     attr_accessor :logger
-    self.logger = Logger.new(STDERR)
+
+    def logger
+      @logger ||= default_logger
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+
+    def default_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
     # arguments - since the pg client does not support this - but it allows to
@@ -127,16 +144,16 @@ module Simple
       @connector = connector
     end
 
-    self.connector = lambda { 
+    self.connector = lambda {
       connect_to_active_record
     }
 
     def connect_to_active_record
       return Connection.new(ActiveRecord::Base.connection) if defined?(ActiveRecord)
 
-      STDERR.puts <<-SQL
-Simple::SQL works out of the box with ActiveRecord-based postgres connections, reusing the current connection.
-To use without ActiveRecord you must connect to a database via Simple::SQL.connect!.
+      STDERR.puts <<~SQL
+        Simple::SQL works out of the box with ActiveRecord-based postgres connections, reusing the current connection.
+        To use without ActiveRecord you must connect to a database via Simple::SQL.connect!.
 SQL
 
       raise ArgumentError, "simple-sql: missing connection"

data/lib/simple-sql.rb

@@ -1 +1,3 @@
+# rubocop:disable Naming/FileName
+
 require "simple/sql"

data/spec/simple/sql_ask_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe "Simple::SQL.ask" do
-  USER_COUNT = 2
-
   def expects(expected_result, sql, *args)
     expect(SQL.ask(sql, *args)).to eq(expected_result)
   end

data/spec/simple/sql_insert_spec.rb

@@ -1,9 +1,6 @@
 require "spec_helper"
 
 describe "Simple::SQL.insert" do
-  USER_COUNT = 2
-  SQL = SQL
-
   def expects(expected_result, sql, *args)
     expect(SQL.record(sql, *args)).to eq(expected_result)
   end

data/spec/simple/sql_record_spec.rb

@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe "Simple::SQL.record" do
-  USER_COUNT = 2
-
   def expects(expected_result, sql, *args)
     expect(SQL.record(sql, *args)).to eq(expected_result)
   end

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }
 require "simple/sql"
 
 SQL = Simple::SQL
+USER_COUNT = 2
+
+ActiveRecord::Base.logger.level = Logger::INFO
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

data/spec/support/001_database.rb

@@ -33,6 +33,6 @@ ActiveRecord::Schema.define do
     t.hstore    :meta_data
     t.column    :access_level, :access_level
 
-    t.timestamps
+    t.timestamps null: true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - radiospiel