simple-sql 0.4.9 → 0.4.10

data/spec/simple/sql_scope_spec.rb

@@ -203,6 +203,21 @@ describe "Simple::SQL::Scope" do
     end
   end
 
+  context "Building with Hash" do
+    it "runs with SQL.ask" do
+      scope = SQL::Scope.new table: "users", select: "1, 2", where: "id >= 0"
+      expect(SQL.all(scope)).to eq([[1,2], [1,2]])
+
+      scope = SQL::Scope.new table: "users", select: [1,3,4], where: "id >= 0"
+      expect(SQL.all(scope)).to eq([[1,3,4], [1,3,4]])
+    end
+    
+    it "raises an error with missing or invalid attributes" do
+      expect { SQL::Scope.new table: "users", limit: 1 }.to raise_error(ArgumentError)
+      expect { SQL::Scope.new select: "*" }.to raise_error(ArgumentError)
+    end
+  end
+
   context "describe pagination" do
     let(:scope) do
       scope = SQL::Scope.new "SELECT 1, 2 FROM users"

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ end
 ENV["RACK_ENV"] = "test"
 ENV["RAILS_ENV"] = "test"
 
+require "byebug"
 require "rspec"
 require "awesome_print"
 Dir.glob("./spec/support/**/*.rb").sort.each { |path| load path }
@@ -30,8 +31,7 @@ RSpec.configure do |config|
   config.example_status_persistence_file_path = ".rspec.data"
 
   config.around(:each) do |example|
-    Simple::SQL.ask "DELETE FROM users"
-    Simple::SQL.ask "DELETE FROM unique_users"
+    Simple::SQL.ask "TRUNCATE TABLE users, unique_users, organizations RESTART IDENTITY CASCADE"
     example.run
   end
 end

data/spec/support/001_database.rb

@@ -12,11 +12,11 @@ ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  execute "DROP SCHEMA public CASCADE;"
-  execute "CREATE SCHEMA public;"
-  execute "CREATE EXTENSION IF NOT EXISTS hstore;"
+  execute <<~SQL
+    DROP SCHEMA public CASCADE;
+    CREATE SCHEMA public;
+    CREATE EXTENSION IF NOT EXISTS hstore;
 
-  execute <<-SQL
     DROP TYPE IF EXISTS access_level;
     CREATE TYPE access_level AS ENUM (
         'private',
@@ -24,24 +24,30 @@ ActiveRecord::Schema.define do
         'viewable',
         'accessible'
     );
-  SQL
 
-  create_table :users, force: true do |t|
-    t.integer   :role_id
-    t.string    :first_name
-    t.string    :last_name
-    t.jsonb     :metadata
-    t.column    :access_level, :access_level
+    CREATE TABLE organizations (
+      id SERIAL PRIMARY KEY,
+      name VARCHAR
+    );
 
-    t.timestamps null: true
-  end
+    CREATE TABLE users (
+      id SERIAL PRIMARY KEY,
+      organization_id INTEGER REFERENCES organizations (id),
+      role_id INTEGER,
+      first_name VARCHAR,
+      last_name VARCHAR,
+      metadata JSONB,
+      access_level access_level,
+      created_at timestamp,
+      updated_at timestamp
+    );
 
-  create_table :unique_users, force: true do |t|
-    t.string    :first_name
-    t.string    :last_name
-  end
+    CREATE TABLE unique_users (
+      id SERIAL PRIMARY KEY,
+      first_name VARCHAR,
+      last_name VARCHAR
+    );
 
-  execute <<-SQL
-  CREATE UNIQUE INDEX unique_users_ix1 ON unique_users(first_name, last_name)
+    CREATE UNIQUE INDEX unique_users_ix1 ON unique_users(first_name, last_name)
   SQL
 end

data/spec/support/003_factories.rb

@@ -21,6 +21,10 @@ def table_attrs(table)
       first_name: sequence("First {{sequence}}"),
       last_name: sequence("Last {{sequence}}")
     }.freeze
+  when :organization
+    {
+      name: sequence("organization {{sequence}}")
+    }.freeze
   else
     raise ArgumentError, "Invalid table for factory: #{table.inspect}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: expectation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -171,12 +185,18 @@ files:
 - lib/simple/sql/config.rb
 - lib/simple/sql/connection.rb
 - lib/simple/sql/connection_adapter.rb
-- lib/simple/sql/decoder.rb
 - lib/simple/sql/duplicate.rb
-- lib/simple/sql/encoder.rb
+- lib/simple/sql/helpers.rb
+- lib/simple/sql/helpers/decoder.rb
+- lib/simple/sql/helpers/encoder.rb
+- lib/simple/sql/helpers/row_converter.rb
 - lib/simple/sql/insert.rb
 - lib/simple/sql/logging.rb
 - lib/simple/sql/reflection.rb
+- lib/simple/sql/result.rb
+- lib/simple/sql/result/association_loader.rb
+- lib/simple/sql/result/records.rb
+- lib/simple/sql/result/rows.rb
 - lib/simple/sql/scope.rb
 - lib/simple/sql/scope/filters.rb
 - lib/simple/sql/scope/order.rb
@@ -189,9 +209,8 @@ files:
 - spec/manual/threadtest.rb
 - spec/simple/sql/version_spec.rb
 - spec/simple/sql_all_into_spec.rb
-- spec/simple/sql_ask_into_spec.rb
-- spec/simple/sql_ask_into_struct_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
@@ -233,9 +252,8 @@ test_files:
 - spec/manual/threadtest.rb
 - spec/simple/sql/version_spec.rb
 - spec/simple/sql_all_into_spec.rb
-- spec/simple/sql_ask_into_spec.rb
-- spec/simple/sql_ask_into_struct_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

data/spec/simple/sql_ask_into_spec.rb

@@ -1,27 +0,0 @@
-require "spec_helper"
-
-describe "Simple::SQL.ask into: argument" do
-  let!(:users) { 1.upto(USER_COUNT).map { create(:user) } }
-
-  it "calls the database" do
-    r = SQL.ask("SELECT COUNT(*) AS count FROM users", into: Hash)
-    expect(r).to eq({count: 2}) 
-  end
-
-  it "returns nil when there is no match" do
-    r = SQL.ask("SELECT * FROM users WHERE FALSE", into: Hash)
-    expect(r).to be_nil
-  end
-
-  it "returns a OpenStruct with into: OpenStruct" do
-    r = SQL.ask("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 = SQL.ask("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
-end

data/spec/simple/sql_ask_into_struct_spec.rb

@@ -1,17 +0,0 @@
-require "spec_helper"
-
-describe "Simple::SQL.ask into: :struct" do
-  let!(:users) { 1.upto(USER_COUNT).map { create(:user) } }
-
-  it "calls the database" do
-    r = SQL.ask("SELECT COUNT(*) AS count FROM users", into: :struct)
-    expect(r.count).to eq(2)
-    expect(r.class.members).to eq([:count])
-  end
-
-  it "reuses the struct" do
-    r1 = SQL.ask("SELECT COUNT(*) AS count FROM users", into: :struct)
-    r2 = SQL.ask("SELECT COUNT(*) AS count FROM users", into: :struct)
-    expect(r1.class.object_id).to eq(r2.class.object_id)
-  end
-end