activequery 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72acf6bff5b58b74b7738ac87e50ca9aa520e4186a3d46b85294fc7671e5bce0
-  data.tar.gz: c6dd9784750fa6d6f8cefbe24bc5333c79b8e3d5a063a27f5f5acdbff89b832d
+  metadata.gz: dfecf5a3421fd5763c30d60a3c2bb2c9722306d641a6ae5e32729909e239fceb
+  data.tar.gz: 86be01caf81eb11756ceacd8270f786dd3676ab60214e026b27c0453d59301cb
 SHA512:
-  metadata.gz: 86eaede33b0564252eef9216bdee12f9e62a5ee23417281ffa7aff6326fcd521545dcd2b3670ee9c5f38a0df9a4c891aaa8f80aa934eb4f96d46c3821f23f52b
-  data.tar.gz: 3e7423324da0a9733c87ee8b545b4852f1b20988b170fc1fb3a8aecc519b97d951aefccab7c4ed82fc805866cc25b70a92f52882af480f8819bd7de7970813f6
+  metadata.gz: 1a2f84ce98adb36d251946d9136a83aadb33f74fa3ecc403fcd1ddb1ddf34f300d6cf20f98eb336f5e4986fd3b77379b4607d8a485bb40d42964b16a30502100
+  data.tar.gz: 3c0942ab98cfeffda8fdf9f0201d0a278e9d5ca7a0a1d74e4f33e2d17f5a92e17457c3c0b4141c9605d6dfdfa790e6f0f62678e64523554c6e172d948e8670df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activequery (0.2.0)
+    activequery (0.2.1)
       strscan (~> 1.0)
 
 GEM
@@ -18,6 +18,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rake (10.5.0)
+    rantly (2.0.0)
     strscan (1.0.0)
 
 PLATFORMS
@@ -31,6 +32,7 @@ DEPENDENCIES
   pg (~> 1.0)
   pry
   rake (~> 10.0)
+  rantly (~> 2.0.0)
 
 BUNDLED WITH
    1.17.2

data/README.md

@@ -81,7 +81,8 @@ end
 - [x] PostgreSQL Adapter
 - [x] Ruby erb inside sql template files 
 - [x] Async/Stream results (ideal for realtime reporting/analytics)
-- [ ] Named parameters, and ?-style positional parameters 
+- [x] Named parameters
+- [ ] ?-style positional parameters 
 - [ ] class: MyClass param to create or extend ruby class with 
 - [ ] Import/Export to Materialized Views 
 - [ ] Retrieving SQL templates from custom stores (Redis, Riak)

data/activequery.gemspec

@@ -49,5 +49,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency 'pg', '~> 1.0'
   spec.add_development_dependency 'benchmark-memory', '~> 0.1.2'
+  spec.add_development_dependency 'rantly', '~> 2.0.0'
   
 end

data/lib/active_query.rb

@@ -3,6 +3,10 @@ require "active_query/configuration"
 require "active_query/sql_template"
 require "active_query/data_adapters/postgresql_adapter"
 require 'pg'
+
+class ApplicationError < StandardError 
+end
+
 module ActiveQuery
   include ActiveQuery::DataAdapters
   # Configuration
@@ -22,7 +26,7 @@ module ActiveQuery
     yield(config)
   end
   
-  # runners... 
+  # WIP runners... 
   # Full-Scan
   def self.run(query)
     if query.is_a? Symbol
@@ -67,18 +71,20 @@ module ActiveQuery
   # Build heleper methods for query names
   #fail TemplatePathError, "templates path missing" if self.config.template_path.empty?
   puts "Loading SQL templates from #{self.config.template_path}" 
-  t = ActiveQuery::SQLTemplate.new(self.config)
-  t.load!
 
-  t.templates.each do |query| 
-    define_singleton_method(:"#{query.name}") do |params=nil|
-      query.query
+  begin 
+    t = ActiveQuery::SQLTemplate.new(self.config)
+    t.load!
+    t.templates.each do |query| 
+    if query
+      define_singleton_method(:"#{query.name}") do |params=nil|
+        query.query
+      end
     end
   end
-
   puts "SQL templates loaded." 
   rescue ApplicationError => err
-      $stderr.puts "%p ::SQLTemplate.load! %s" % [ err.class, err.message ]
-
-
-end
+      $stderr.puts "%p ::ActiveQuery.load! %s" % [ err.class, err.message ]
+  end
+  
+end

data/lib/active_query/data_adapters/adapter_base.rb

@@ -1,11 +1,26 @@
 module ActiveQuery
 	module DataAdapters
 		class AdapterBase
-      
+      # WIP
       def initialize(connection, logger = nil, config = {}) 
         super()
         @connection = connection
       end
+
+      def transaction(*args, &blk)
+        @connection.execute(false) do |conn|
+          super
+        end
+      end
+
+      def real_connection
+        @connection.connection
+      end
+
+      def open_transactions
+        real_connection.open_transactions
+      end
+
 			
       def exec(conn)
         raise "Not implemented"

data/lib/active_query/sql_parser.rb

@@ -2,23 +2,32 @@ module ActiveQuery
   module SQLParser
 
     require 'strscan'
-    class SyntaxError < StandardError; end
+
+    class InvalidQueryError < ArgumentError; end
+    class SyntaxError < StandardError
+      attr_reader :line, :pos
+      def initialize(msg = "", line:, pos:)
+        msg = "Missing #{msg} on line #{line} (pos. #{pos})"
+        super(msg)
+      end
+    end
 
     Query = Struct.new(:name, :params, :comment, :query) 
   
     WHITESPACE = /\s+/
     NAME = /^\s*--\s*name\s*:\s*(.+)/
-    END_QUERY = /;/
+    QNAME = /^\s*--\s*name\s*:/
+    SEMICOLON = /;/
     PARAMS = /\(\:\s*([^)]+?)\s*\)/
     ALL_COMMENTS = /(?-m:--.*)|(?m:--\*.--?\*\/)/
     PARAM = /:\w+/
    
     def self.parse_query(query)
-      @scanner = StringScanner.new(query)
+      @scanner = StringScanner.new(query.strip)
       @line = 0
       @query = Query.new 
 
-      until @scanner.eos? || @scanner.check_until(END_QUERY).nil? 
+      until @scanner.eos?
         @line += 1
         parse_line
       end
@@ -29,27 +38,38 @@ module ActiveQuery
     private
     def self.parse_line
       @query.params = []
-      
-      # Query name match: --name
-      @scanner.skip(NAME)
-      qname = @scanner.captures
-      if qname
-        @query.name = qname.first
-      else
-        fail SyntaxError, "error on line #{@line} (pos. #{@scanner.pos})"
+      # Query name match: --name:
+      header = @scanner.check_until(NAME)
+      unless header
+         fail SyntaxError.new("'-- name:'", line: @line, pos: @scanner.pos)
+      end
+
+      ## ===============================
+      # Query name match after: --name:
+      # Todo: test missing name 
+      query_name = @scanner.scan_until(NAME)
+      unless query_name 
+        fail SyntaxError.new("query name", line: @line, pos: @scanner.pos)        
       end
+      @query.name = @scanner.captures&.first.strip
 
-      @query.query = @scanner.rest
-      fail SyntaxError unless @query.query
+      # SQL expression
+      @scanner.skip_until(ALL_COMMENTS)
+      @scanner.skip_until(/^\s+/)
+      query = @scanner.check_until(SEMICOLON)
+      if query && query != ';'
+        @query.query = query.strip
+      else
+         fail SyntaxError.new("SQL expression", line: @line, pos: @scanner.pos)
+      end
 
       # All params 
       until @scanner.check_until(PARAM).nil?
         @scanner.scan_until(PARAM)
         @query.params.push @scanner.matched
       end
-
-      # End of query match: ;
-      @scanner.scan_until(END_QUERY)
+      # done 
+      @scanner.scan_until(SEMICOLON) # important! don't touch
     end
 
     # and this only work for postgres - split transform from struct
@@ -65,6 +85,10 @@ module ActiveQuery
       end
     end
 
+    def self.valid_query?(query)
+      query.name && query.name != "" && 
+      query.query && query.query != ""
+    end
 
   end
 end

data/lib/active_query/sql_template.rb

@@ -25,7 +25,8 @@ module ActiveQuery
 			else 
 				Find.find(template_path) do |path| 
 					if File.basename(path) =~ /sql$/
-						@templates << parse_sql(path)
+						sql = parse_sql(path)
+						@templates << sql if sql 
 					end
 				end
 			end
@@ -36,14 +37,19 @@ module ActiveQuery
 		end
 		
 		private 
+		
 		def read_sql_file(path:)
 			open(path, "r") { |t| ERB.new(t.read).result(binding) } 
 		end
 
 		def parse_sql(path)
-			sql_template = read_sql_file(path: path)
-			ActiveQuery::SQLParser.parse_query(sql_template)
-		end
+			sql_template = read_sql_file(path: path) 
+			begin
+				ActiveQuery::SQLParser.parse_query(sql_template)
+			rescue ActiveQuery::SQLParser::SyntaxError => err
+			  $stderr.puts "%p %s:" % [ err.class, err.message ]
+			end
 
+		end
 	end
-end
+end

data/lib/active_query/version.rb

@@ -1,3 +1,3 @@
 module ActiveQuery
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activequery
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: rantly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: Raw sql with ruby - ideal for reports, large queries, separating SQL
   from code logic and CQRS
 email: