quote-sql 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f787b04560e3b297b4a392eb72c0e85be57e349a0533366056fe485f339401
-  data.tar.gz: ad8a2e347c97e12b78a264e67d0e12649e838127a0079d8ff96bf5ac51764b40
+  metadata.gz: cb47e85b4c7c4e1f945748295390c9e1bd49b7e0ba5291e0f7310058f6f91ddc
+  data.tar.gz: 0f5bde1afc31eb573bb3e24727b530bf5909048284114d45c56c1b24a63e97aa
 SHA512:
-  metadata.gz: 7d2a6819ad0d7fc752a70a04efb48c7583759a1b6cd07eb93c0bacd5deec9845b4abf578ae902c94aaf68ba4cf41720b1f05aea8dc6950b468c8cc8f42c34c42
-  data.tar.gz: e84a311154ef05f71b8af81c17cac1b4923f067fb48556f501aa075ab8fca1c112d494c8b0b58f1c8350d7d7467c10ba99f74591755beb206415dbe78756c7ff
+  metadata.gz: 6596b9bb50ee373030e401dcb9d0067ae31857b6467fdd7b0341e21b3dcbe8fb0e78714ec24f56615618bbf965849307474a4030978e6c98d2d728166e235151
+  data.tar.gz: f38366de3e2227835fd11f512a9c9d2a99d130d896a17f6b0a58788dd8ed7ebd13f46682992b762e2d50f09716c3bd5654d525dc4b03f350d3a52cc6b19b322e

data/README.md

@@ -9,13 +9,15 @@ I created this library while coding for different projects, and had lots of Here
 
 My strategy is to segment SQL Queries in readable junks, which can be individually tested and then combine their sql to the final query.
 
-QuoteSql is used in production, but is still bleeding edge - and there is not a fully sync between doc and code.
-
 If you think QuoteSql is interesting, let's chat!
 Also if you have problems using it, just drop me a note.
 
 Best Martin
 
+## Caveats & Notes
+- QuoteSql is used in production, but is still bleeding edge - and there is not a fully sync between doc and code.
+- Just for my examples and in the docs, I'm using for Yajl for JSON parsing, and changed in my environments the standard parse output to *symbolized keys*. 
+
 ## Examples
 ### Simple quoting
 `QuoteSql.new("SELECT %field").quote(field: "abc").to_sql`
@@ -119,6 +121,12 @@ with optional array dimension
   - +String+ value will become the expression, the key the AS {result: "SUM(*)"} => SUM(*) AS result
   - +Proc+ are executed with the +QuoteSQL::Quoter+ object as parameter and added as raw SQL
 
+## Executing
+### Getting the results
+### Binds
+  `v = {a: 1, b: "foo", c: true};QuoteSQL(%q{Select * From %x_json}, x_json: 1, x_casts: {a: "int", b: "text", c: "boolean"}).result(v.to_json)`
+  => Select * From json_to_recordset($1) AS "x"("a" int,"b" text,"c" boolean) => [{a: 1, b: "foo", c: true}]
+
 ## Shortcuts and functions
 - `QuoteSQL("select %abc", abc: 1)` == `QuoteSql.new("select %abc").quote(abc: 1)`
 - when you have in your initializer `String.include QuoteSql::Extension` you can do e.g. `"select %abc".quote_sql(abc: 1)`

data/lib/quote_sql/quoter.rb

@@ -37,9 +37,13 @@ class QuoteSql
     def ident_columns(name = nil)
       item = columns(name || self.name)
       unless item
-        table = self.table(name || self.name)
-        raise ArgumntError, "No columns or table given" unless table&.respond_to? :column_names
-        item = table.column_names
+        unless item = casts(name || self.name)&.keys
+          if (table = self.table(name || self.name))&.respond_to? :column_names
+            item = table.column_names
+          else
+            raise ArgumntError, "No columns, casts or table given for #{name}" unless table&.respond_to? :column_names
+          end
+        end
       end
       if item.is_a?(Array)
         if item.all? { _1.respond_to?(:name) }
@@ -143,11 +147,15 @@ class QuoteSql
       casts = self.casts(name)
       columns = self.columns(name) || casts&.keys
       column_cast = columns&.map { "#{QuoteSql.quote_column_name(_1)} #{casts&.dig(_1) || "TEXT"}" }
-      item = [item].flatten.compact.as_json.map{_1.slice(*columns.map(&:to_s))}
-      Raw.sql "json_to_recordset('#{item.to_json.gsub(/'/,"''")}') AS #{QuoteSql.quote_column_name name}(#{column_cast.join(',')})"
+      if item.is_a? Integer
+        rv = "$#{item}"
+      else
+        item = [item].flatten.compact.as_json.map { _1.slice(*columns.map(&:to_s)) }
+        rv = "'#{item.to_json.gsub(/'/, "''")}'"
+      end
+      Raw.sql "json_to_recordset(#{rv}) AS #{QuoteSql.quote_column_name name}(#{column_cast.join(',')})"
     end
 
-
     def data_values(item = @quotable)
       item = Array(item).compact
       column_names = columns(name)

data/lib/quote_sql/test.rb

@@ -1,59 +1,5 @@
 class QuoteSql::Test
-
-  def all
-    @success = []
-    @fail = []
-    private_methods(false).grep(/^test_/).each { run(_1, true) }
-    @success.each { STDOUT.puts(*_1, nil) }
-    @fail.each { STDOUT.puts(*_1, nil) }
-    puts
-  end
-
-  def run(name, all = false)
-    name = name.to_s.sub(/^test_/, "")
-    rv = ["🧪 #{name}"]
-    @expected = nil
-    @test = send("test_#{name}")
-    if sql.gsub(/\s+/, "")&.downcase&.strip == expected&.gsub(/\s+/, "")&.downcase&.strip
-      tables = @test.tables.to_h { [[_1, "table"].compact.join("_"), _2] }
-      columns = @test.instance_variable_get(:@columns).to_h { [[_1, "columns"].compact.join("_"), _2] }
-      rv += [@test.original, { **tables, **columns, **@test.quotes }.inspect, "🎯 #{expected}", "✅ #{sql}"]
-      @success << rv if @success
-    else
-      rv += [@test.inspect, "🎯 #{expected}", "❌ #{sql}"]
-      @fail << rv if @fail
-    end
-  rescue => exc
-    rv += [@test.inspect, "🎯 #{expected}", "❌ #{sql}", exc.message]
-    @fail << rv if @fail
-  ensure
-    STDOUT.puts(*rv) unless @fail or @success
-  end
-
-  def expected(v = nil)
-    @expected ||= v
-  end
-
-  def sql
-    @test.to_sql
-  end
-
-  class PseudoActiveRecord
-    def self.table_name
-      "pseudo_active_records"
-    end
-
-    def self.column_names
-      %w(id column1 column2)
-    end
-
-    def to_qsl
-      "SELECT * FROM #{self.class.table_name}"
-    end
-  end
-
   private
-
   def test_columns
     expected <<~SQL
       SELECT x, "a", "b", "c", "d"
@@ -189,6 +135,20 @@ class QuoteSql::Test
     "INSERT INTO users (name, color) SELECT * from %x_json".quote_sql(x_casts: {name: "text", color: "text"}, x_json:)
   end
 
+  def test_from_json_bind
+    expected <<~SQL
+        Select * From json_to_recordset($1) AS "x"("a" int,"b" text,"c" boolean)
+    SQL
+    QuoteSQL("Select * From %x_json", x_json: 1, x_casts: {a: "int", b: "text", c: "boolean"})
+  end
+
+  def test_insert_json_bind
+    expected <<~SQL
+         INSERT INTO table ("a","b","c") Select * From json_to_recordset($1) AS "x"("a" int,"b" text,"c" boolean)  
+    SQL
+    QuoteSQL("INSERT INTO table (%x_columns) Select * From %x_json", x_json: 1, x_casts: {a: "int", b: "text", c: "boolean"})
+  end
+
   # def test_q3
   #   expected Arel.sql(<<-SQL)
   #         INSERT INTO "responses" ("id","type","task_id","index","data","parts","value","created_at","updated_at")
@@ -212,4 +172,60 @@ class QuoteSql::Test
   #     )
   # end
 
+
+  public
+
+  def all
+    @success = []
+    @fail = []
+    private_methods(false).grep(/^test_/).each { run(_1, true) }
+    @success.each { STDOUT.puts(*_1, nil) }
+    @fail.each { STDOUT.puts(*_1, nil) }
+    puts
+  end
+
+  def run(name, all = false)
+    name = name.to_s.sub(/^test_/, "")
+    rv = ["🧪 #{name}"]
+    @expected = nil
+    @test = send("test_#{name}")
+    if sql.gsub(/\s+/, "")&.downcase&.strip == expected&.gsub(/\s+/, "")&.downcase&.strip
+      tables = @test.tables.to_h { [[_1, "table"].compact.join("_"), _2] }
+      columns = @test.instance_variable_get(:@columns).to_h { [[_1, "columns"].compact.join("_"), _2] }
+      rv += [
+        "QuoteSql.new(\"#{@test.original}\").quote(#{{**tables, **columns, **@test.quotes }.inspect}).to_sql", "🎯 #{expected}", "✅ #{sql}"]
+      @success << rv if @success
+    else
+      rv += [@test.inspect, "🎯 #{expected}", "❌ #{sql}"]
+      @fail << rv if @fail
+    end
+  rescue => exc
+    rv += [@test.inspect, "🎯 #{expected}", "❌ #{sql}", exc.message]
+    @fail << rv if @fail
+  ensure
+    STDOUT.puts(*rv) unless @fail or @success
+  end
+
+  def expected(v = nil)
+    @expected ||= v
+  end
+
+  def sql
+    @test.to_sql
+  end
+
+  class PseudoActiveRecord
+    def self.table_name
+      "pseudo_active_records"
+    end
+
+    def self.column_names
+      %w(id column1 column2)
+    end
+
+    def to_qsl
+      "SELECT * FROM #{self.class.table_name}"
+    end
+  end
+
 end

data/lib/quote_sql/version.rb

@@ -1,3 +1,3 @@
 class QuoteSql
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/quote_sql.rb

@@ -82,14 +82,14 @@ time(stamp)?(_\\(\d+\\))?(_with(out)?_time_zone)?
     @sql
   end
 
-  def result(binds = [], prepare: false, async: false)
+  def result(*binds, prepare: false, async: false)
     sql = to_sql
-    if binds.present? and sql.scan(/(?<=\$)\d+/).map(&:to_i).max + 1 != binds.length
+    if binds.present? and sql.scan(/(?<=\$)\d+/).map(&:to_i).max != binds.length
       raise ArgumentError, "Wrong number of binds"
     end
     _exec(sql, binds, prepare: false, async: false)
   rescue => exc
-    STDERR.puts exc.sql
+    STDERR.puts exc.inspect, self.inspect
     raise exc
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quote-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Martin Kufner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceql