qreport 0.0.9 → 0.0.10

data/ChangeLog

@@ -1,6 +1,10 @@
+2013-10-01  Kurt A. Stephens  <ks.github@kurtstephens.com>
+	* v0.0.10: New Features.
+	* Support CTE queries using "FROM (<subselect>) AS" syntax.
+
 2013-09-24  Kurt A. Stephens  <ks.github@kurtstephens.com>
 	* v0.0.9: New Version: Bug fixes.
-	* Use Connection.verbose_stream.
+	* Use Connection#verbose_stream.
 
 2013-09-24  Kurt A. Stephens  <ks.github@kurtstephens.com>
 	* v0.0.8: Bug fixes, performance improvements, new features.

data/lib/qreport/report_runner.rb

@@ -32,10 +32,10 @@ module Qreport
         # Create a report row sequence:
         run "DROP SEQUENCE IF EXISTS   qr_row_seq"
         run "CREATE TEMPORARY SEQUENCE qr_row_seq"
-      # Infer base columns, if not specified.
-      if report_run.base_columns.empty?
-        infer_base_columns!
-      end
+        # Infer base columns, if not specified.
+        if report_run.base_columns.empty?
+          infer_base_columns!
+        end
       end
 
       # Construct report_table name from column names and types:
@@ -109,7 +109,7 @@ module Qreport
       begin
         conn.transaction do
           # Proof query to infer base columns:
-          result = run report_run.report_sql, :limit => 0, :arguments => arguments, :verbose => @verbose
+          result = run report_sql(sql, :limit => 'LIMIT 0'), :arguments => arguments, :verbose => @verbose
           base_columns = report_run.base_columns = result.columns
         end # transaction
       rescue ::StandardError => exc
@@ -118,16 +118,20 @@ module Qreport
       base_columns
     end
 
-    def report_sql sql
-      sql = sql.sub(/\A\s*SELECT\s+/im, <<"END"
+    def report_sql sql, opts = { }
+      sql = sql.sub(/;\s*\Z/, '')
+      sql = <<"END"
 SELECT
     :qr_run_id
        AS "qr_run_id"
   , nextval('qr_row_seq')
        AS "qr_run_row"
-  , 
+  , _qr_r_.*
+FROM (
+#{sql}
+) AS "_qr_r_"
+#{opts[:limit]}
 END
-          )
       sql
     end
 

data/lib/qreport/version.rb

@@ -1,3 +1,3 @@
 module Qreport
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/lib/qreport/report_runner_spec.rb

@@ -89,6 +89,33 @@ END
     report_run.delete!
   end
 
+  it "should support CTE queries." do
+    report_run = Qreport::ReportRun.new(:name => :counts, :description => 'CTE test')
+    report_run.sql = <<"END"
+WITH
+    total_users AS
+(
+SELECT count(*) AS total_users
+FROM users
+)
+  , total_articles AS
+(
+SELECT count(*) AS total_articles
+FROM articles
+)
+SELECT total_users.*, total_articles.*
+FROM total_users, total_articles;
+END
+    report_run.verbose = true
+    report_run.run! conn
+    report_run.columns.should == [["qr_run_id", "bigint"], ["qr_run_row", "bigint"], ["total_users", "bigint"], ["total_articles", "bigint"]]
+    rows = report_run.select.rows
+    rows.size.should == 1
+    row = rows[0]
+    row['total_users'].should == 10
+    row['total_articles'].should == 100
+  end
+
   it "should support :~ {{PATTERN}} {{EXPR}}." do
     report_run = Qreport::ReportRun.new(:name => :users_with_articles, :description => 'last 24 hours')
     now = Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qreport
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3795772995723267023
+      hash: -862269867070365342
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3795772995723267023
+      hash: -862269867070365342
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25