simple-sql 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf881401ca767b7857ef63d6d04e9ce2e62185e
-  data.tar.gz: 875aa241218c6bb2c0fd6a1b6c00d55f602d30f8
+  metadata.gz: 2fea0396d5b98a9ec21ea6910bf6b68bc35aab90
+  data.tar.gz: bdfd6c5e2a4abbbc82cc86b3564de1c5649d4333
 SHA512:
-  metadata.gz: 64cf973e6c9878b5a55bb8fb7ffeb00e4fe888bd3dc59afa94ecf891243b99d90ef0f24a610406c2abcfc4f1fad6cfd5d2746380e4f7dd1d9e7de66f9f2725d9
-  data.tar.gz: d5a1602a9ed6b52f3a291ffacc0a2cbad045757856e983d5c8bced572eae95a198f139779ecfa97a7dcc406cb09e7f644bca5a588849e76ca72a6edb7e63b668
+  metadata.gz: 50cd39402330417cbf4e6f81ff9ad49cc15b1bf96f3a11772e57e677803dac734e898d1b44036e299bda343a54fc9d6b606351377589ceb8908bd3d69280a046
+  data.tar.gz: bb6482542f96b64c8b9a75c19421dbfe01953fa6cdc76e2bdee5aaabcbdea931d44a8c2cf184819b6630559d7bc30757dbec5f0c5002b00df92a7ed93943eeb0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.2.5)
+    simple-sql (0.2.6)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 
@@ -22,6 +22,7 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.4)
     ast (2.3.0)
+    awesome_print (0.4.0)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     database_cleaner (1.6.2)
@@ -78,6 +79,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4)
+  awesome_print (~> 0)
   database_cleaner (~> 1)
   factory_girl (= 4.8.0)
   pg (= 0.20)

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+$: << "lib"
+require "simple/sql"
+
+SQL = Simple::SQL
+SQL.connect!
+
+def reload!
+  $VERBOSE = nil
+  Dir.glob("lib/simple/sql/**/*.rb").sort.each do |path|
+    STDERR.puts path
+    load path
+  end 
+end
+
+require "irb"
+IRB.start

data/config/database.yml

@@ -1,7 +1,15 @@
-adapter: postgresql
-encoding: utf8
-host: '127.0.0.1'
-username: postgres
-pool: 5
-timeout: 5000
-database: simple-sql-test
+defaults: &defaults
+  adapter: postgresql
+  encoding: utf8
+  host: '127.0.0.1'
+  username: postgres
+  pool: 5
+  timeout: 5000
+
+test:
+  <<: *defaults
+  database: simple-sql-test
+
+development:
+  <<: *defaults
+  database: simple-sql

data/lib/simple/sql.rb

@@ -1,11 +1,14 @@
+require "forwardable"
+require "logger"
+
 require_relative "sql/version.rb"
 require_relative "sql/decoder.rb"
 require_relative "sql/encoder.rb"
 require_relative "sql/config.rb"
 require_relative "sql/logging.rb"
 require_relative "sql/connection.rb"
-
-require "logger"
+require_relative "sql/reflection.rb"
+require_relative "sql/insert.rb"
 
 module Simple
   # The Simple::SQL module

data/lib/simple/sql/insert.rb

@@ -0,0 +1,65 @@
+module Simple
+  module SQL
+    # Inse
+    def insert(table, records)
+      if records.is_a?(Hash)
+        return insert(table, [records]).first
+      end
+
+      return [] if records.empty?
+
+      inserter = Inserter.create(table_name: table.to_s, columns: records.first.keys)
+      inserter.insert(records: records)
+    end
+
+    class Inserter
+      SQL = ::Simple::SQL
+
+      @@inserters = {}
+
+      def self.create(table_name:, columns:)
+        @@inserters[[table_name, columns]] ||= new(table_name: table_name, columns: columns)
+      end
+
+      #
+      # - table_name - the name of the table
+      # - columns - name of columns, as Array[String] or Array[Symbol]
+      #
+      def initialize(table_name:, columns:)
+        @columns = columns
+
+        cols = []
+        vals = []
+
+        cols += columns
+        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"
+      end
+
+      # timestamp_columns are columns that will be set to the current time when
+      # inserting a record. This includes:
+      #
+      # - inserted_at (for Ecto) 
+      # - created_at (for ActiveRecord)
+      # - updated_at (for Ecto and ActiveRecord)
+      def timestamp_columns_in_table(table_name)
+        columns_for_table = SQL::Reflection.columns(table_name).keys
+        columns_for_table & %w(inserted_at created_at updated_at)
+      end
+
+      def insert(records: records)
+        SQL.transaction do
+          records.map do |record|
+            SQL.ask @sql, *record.values_at(*@columns)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/simple/sql/reflection.rb

@@ -0,0 +1,58 @@
+module Simple
+  module SQL
+    module Reflection
+      extend self
+
+      extend Forwardable
+      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
+          SQL
+        end
+        records = ::Simple::SQL.records sql, schema
+        records_by_attr(records, :name)
+      end
+
+      def columns(table_name)
+        schema, table_name = parse_table_name(table_name)
+        records = ::Simple::SQL.records <<~SQL, schema, table_name
+          SELECT
+            column_name AS name,
+            *
+          FROM information_schema.columns
+          WHERE table_schema=$1 AND table_name=$2
+        SQL
+
+        records_by_attr(records, :column_name)
+      end
+
+      private
+
+      def parse_table_name(table_name)
+        p1, p2 = table_name.split(".", 2)
+        if p2
+          [ p1, p2 ]
+        else
+          [ "public", p1 ]
+        end
+      end
+
+      def records_by_attr(records, attr)
+        records.inject({}) do |hsh, record|
+          hsh.update record[attr] => OpenStruct.new(record)
+        end
+      end
+    end
+  end
+end

data/lib/simple/sql/version.rb

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

data/simple-sql.gemspec

@@ -41,4 +41,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'factory_girl', '4.8.0'
   gem.add_development_dependency 'database_cleaner', '~> 1'
   gem.add_development_dependency 'simplecov', '~> 0'
+  gem.add_development_dependency 'awesome_print', '~> 0'
 end

data/spec/simple/sql/version_spec.rb

@@ -1,10 +1,10 @@
 require "spec_helper"
 
-describe Simple::SQL do
+describe SQL do
   describe "VERSION" do
     it "defines a version string" do
       # Note: this allows for 0.12.34beta
-      expect(Simple::SQL::VERSION).to match(/^\d+\.\d+\.\d+/)
+      expect(SQL::VERSION).to match(/^\d+\.\d+\.\d+/)
     end
   end
 end

data/spec/simple/sql_ask_spec.rb

@@ -4,7 +4,7 @@ describe "Simple::SQL.ask" do
   USER_COUNT = 2
 
   def expects(expected_result, sql, *args)
-    expect(Simple::SQL.ask(sql, *args)).to eq(expected_result)
+    expect(SQL.ask(sql, *args)).to eq(expected_result)
   end
 
   let!(:users) { 1.upto(USER_COUNT).map { create(:user) } }
@@ -15,5 +15,6 @@ describe "Simple::SQL.ask" do
     expects 2, "SELECT COUNT(*) FROM users"
     expects 1, "SELECT COUNT(*) FROM users WHERE id=$1", users.first.id
     expects 0, "SELECT COUNT(*) FROM users WHERE id=$1", -1
+    expects nil, "SELECT id FROM users WHERE FALSE"
   end
 end

data/spec/simple/sql_config_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "Simple::SQL::Config" do
+  describe ".determine_url" do
+    it "reads config/database.yml" do
+      expect(SQL::Config.determine_url).to eq "postgres://postgres@127.0.0.1/simple-sql-test"
+    end
+  end
+
+  describe ".parse_url" do
+    it "parses a DATABASE_URL" do
+      parsed = SQL::Config.parse_url "postgres://foo:bar@server/database"
+      expect(parsed).to eq(
+          dbname: "database",
+          host: "server",
+          password: "bar",
+          sslmode: "prefer",
+          user: "foo")
+    end
+
+    it "may enforce SSL" do
+      parsed = SQL::Config.parse_url "postgress://foo:bar@server/database"
+      expect(parsed).to eq(
+          dbname: "database",
+          host: "server",
+          password: "bar",
+          sslmode: "require",
+          user: "foo")
+    end
+  end
+end

data/spec/simple/sql_conversion_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Simple::SQL conversions" do
   def expects(expected_result, sql, *args)
-    expect(Simple::SQL.ask(sql, *args)).to eq(expected_result)
+    expect(SQL.ask(sql, *args)).to eq(expected_result)
   end
 
   describe "data conversions" do
@@ -30,6 +30,19 @@ describe "Simple::SQL conversions" do
       expects({"a"=>1, "b"=>2}, 'SELECT \'{"a":1,"b":2}\'::jsonb')
     end
 
+    it "converts double precision" do
+      expects 1.0, "SELECT 1.0::double precision"
+    end
+
+    it "converts bool" do
+      expects true, "SELECT TRUE"
+      expects false, "SELECT FALSE"
+    end
+
+    it "converts hstore" do
+      expects({ a: "1", b: "3" }, "SELECT 'a=>1,b=>3'::hstore")
+    end
+
     xit "fails sometimes w/ malformed array literal, pt. 1" do
       expects  0, 'SELECT $1::varchar[]', [ "foo", 'foo,"bar}' ]
     end

data/spec/simple/sql_insert_spec.rb

@@ -0,0 +1,32 @@
+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
+
+  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.record("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)
+
+    #
+    # 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/simple/sql_record_spec.rb

@@ -4,28 +4,29 @@ describe "Simple::SQL.record" do
   USER_COUNT = 2
 
   def expects(expected_result, sql, *args)
-    expect(Simple::SQL.record(sql, *args)).to eq(expected_result)
+    expect(SQL.record(sql, *args)).to eq(expected_result)
   end
 
   let!(:users) { 1.upto(USER_COUNT).map { create(:user) } }
 
-  before do
-    expect(User.count).to eq(2)
-  end
-
   it "calls the database" do
-    r = Simple::SQL.record("SELECT COUNT(*) AS count FROM users")
+    r = SQL.record("SELECT COUNT(*) AS count FROM users")
     expect(r).to eq({count: 2}) 
   end
 
+  it "returns nil when there is no record" do
+    r = SQL.record("SELECT * FROM users WHERE FALSE", into: OpenStruct)
+    expect(r).to be_nil
+  end
+
   it "supports the into: option" do
-    r = Simple::SQL.record("SELECT COUNT(*) AS count FROM users", into: OpenStruct)
+    r = SQL.record("SELECT COUNT(*) AS count FROM users", into: OpenStruct)
     expect(r).to be_a(OpenStruct)
     expect(r).to eq(OpenStruct.new(count: 2))
   end
 
   it "supports the into: option even with parameters" do
-    r = Simple::SQL.record("SELECT $1::integer AS count FROM users", 2, into: OpenStruct)
+    r = SQL.record("SELECT $1::integer AS count FROM users", 2, into: OpenStruct)
     expect(r).to be_a(OpenStruct)
     expect(r).to eq(OpenStruct.new(count: 2))
   end

data/spec/simple/sql_reflection_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "Simple::SQL::Reflection" do
+  describe ".columns" do
+    it "returns the columns of a table in the public schema" do
+      r = SQL::Reflection.columns("users")
+      expect(r).to be_a(Hash)
+      expect(r["first_name"].name).to eq("first_name")
+    end
+
+    it "returns the columns of a table in a non-'public' schema" do
+      r = SQL::Reflection.columns("information_schema.tables")
+      expect(r["table_name"].name).to eq("table_name")
+    end
+  end
+
+  describe ".tables" do
+    it "returns the tables in the public schema" do
+      r = SQL::Reflection.tables
+      expect(r.keys).to include("users")
+      expect(r["users"].name).to eq("users")
+    end
+
+    it "returns tables in a non-'public' schema" do
+      r = SQL::Reflection.tables(schema: "information_schema")
+      expect(r.keys).to include("information_schema.tables")
+      expect(r["information_schema.tables"].name).to eq("information_schema.tables")
+      expect(r["information_schema.tables"].table_name).to eq("tables")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,11 +7,13 @@ ENV["RACK_ENV"] = "test"
 ENV["RAILS_ENV"] = "test"
 
 require "rspec"
-
+require "awesome_print"
 Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }
 
 require "simple/sql"
 
+SQL = Simple::SQL
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: (ENV["CI"] != "true")

data/spec/support/001_database.rb

@@ -1,7 +1,8 @@
 # connect to the database and setup the schema
 require "active_record"
-
-ActiveRecord::Base.establish_connection(YAML.load_file("config/database.yml"))
+require "yaml"
+abc = YAML.load_file("config/database.yml")
+ActiveRecord::Base.establish_connection(abc["test"])
 
 # Remove after migration to Rails 5
 ActiveRecord::Base.raise_in_transactional_callbacks = true
@@ -31,5 +32,7 @@ ActiveRecord::Schema.define do
     t.string    :last_name
     t.hstore    :meta_data
     t.column    :access_level, :access_level
+
+    t.timestamps
   end
 end

data/spec/support/004_simplecov.rb

@@ -1,13 +1,10 @@
 require "simplecov"
 
 SimpleCov.start do
-  # add_filter do |src|
-  #   # paths = %w(auth authentication authorization).map do |library_name|
-  #   #   File.expand_path("../../#{library_name}/lib", __FILE__)
-  #   # end
-  #
-  #   !paths.any? { |path| src.filename =~ /^#{Regexp.escape(path)}/ }
-  # end
+  # return true to remove src from coverage 
+  add_filter do |src|
+    src.filename =~ /\/spec\//
+  end
 
   minimum_coverage 96
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SQL with a simple interface. Postgres only.
 email: eno@radiospiel.org
 executables: []
@@ -163,6 +177,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/console
 - bin/rake
 - config/database.yml
 - lib/simple-sql.rb
@@ -171,14 +186,19 @@ files:
 - lib/simple/sql/connection.rb
 - lib/simple/sql/decoder.rb
 - lib/simple/sql/encoder.rb
+- lib/simple/sql/insert.rb
 - lib/simple/sql/logging.rb
+- lib/simple/sql/reflection.rb
 - lib/simple/sql/version.rb
 - log/.gitkeep
 - simple-sql.gemspec
 - spec/simple/sql/version_spec.rb
 - spec/simple/sql_ask_spec.rb
+- spec/simple/sql_config_spec.rb
 - spec/simple/sql_conversion_spec.rb
+- spec/simple/sql_insert_spec.rb
 - spec/simple/sql_record_spec.rb
+- spec/simple/sql_reflection_spec.rb
 - spec/spec_helper.rb
 - spec/support/001_database.rb
 - spec/support/002_database_cleaner.rb
@@ -213,8 +233,11 @@ summary: SQL with a simple interface
 test_files:
 - spec/simple/sql/version_spec.rb
 - spec/simple/sql_ask_spec.rb
+- spec/simple/sql_config_spec.rb
 - spec/simple/sql_conversion_spec.rb
+- spec/simple/sql_insert_spec.rb
 - spec/simple/sql_record_spec.rb
+- spec/simple/sql_reflection_spec.rb
 - spec/spec_helper.rb
 - spec/support/001_database.rb
 - spec/support/002_database_cleaner.rb