qreport 0.0.6 → 0.0.7

data/lib/qreport/report_runner.rb

@@ -24,19 +24,19 @@ module Qreport
 
       Connection.current = connection
 
-      conn.transaction do
-        # Create a report row sequence:
-        run "CREATE TEMPORARY SEQUENCE qr_row_seq"
-      end
-
       # Rewrite query to create result table rows:
       self.arguments = arguments.merge(:qr_run_id => conn.safe_sql("nextval('qr_row_seq')"))
       report_run.report_sql = report_sql(sql)
 
+      conn.transaction do
+        # 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
+      end
 
       # Construct report_table name from column names and types:
       report_table = report_run.report_table
@@ -53,6 +53,10 @@ module Qreport
         # Run query into report table:
         begin
           conn.transaction do
+            # Create a report row sequence:
+            run "DROP SEQUENCE IF EXISTS   qr_row_seq"
+            run "CREATE TEMPORARY SEQUENCE qr_row_seq"
+
             unless conn.table_exists? report_table
               result =
               run "CREATE TABLE #{report_table} AS #{report_run.report_sql}", :arguments => arguments, :verbose => @verbose
@@ -77,6 +81,8 @@ module Qreport
               result = report_run._select :COLUMNS => 'COUNT(*) AS "nrows"' #, :verbose => true
               nrows = result.rows[0]["nrows"] || (raise Error, "cannot determine nrows")
             end
+
+            run "DROP SEQUENCE IF EXISTS qr_row_seq"
             # pp result
             result = nil
           end # transaction
@@ -86,7 +92,7 @@ module Qreport
       end
 
       conn.transaction do
-        run "DROP SEQUENCE qr_row_seq" unless error_1
+        run "DROP SEQUENCE IF EXISTS qr_row_seq"
 
         # Update stats:
         report_run.finished_at = Time.now.utc

data/lib/qreport/version.rb

@@ -1,3 +1,3 @@
 module Qreport
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/qreport.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
-  gem.add_development_dependency 'rspec', '~> 2.12'
+  gem.add_development_dependency 'rspec', '~> 2.13'
   gem.add_development_dependency 'simplecov', '~> 0.7.1'
   gem.add_development_dependency "guard", "~> 1.8.0"
   gem.add_development_dependency "guard-rspec", "~> 3.0.2"

data/spec/lib/qreport/connection_spec.rb

@@ -98,11 +98,14 @@ describe Qreport::Connection do
     [ :a_symbol!, "'a_symbol!'", :a_symbol!.to_s ],
     [ Time.parse('2011-04-27T13:23:00.000000Z'), "'2011-04-27T13:23:00.000000Z'::timestamp", Time.parse('2011-04-27T13:23:00.000000') ],
     [ Time.parse('2011-04-27 13:23:00 -0500'), "'2011-04-27T13:23:00.000000-05:00'::timestamp", Time.parse('2011-04-27 13:23:00 -0500') ],
+    [ [ 1, "2", :three ], "'[1,\"2\",\"three\"]'", :IGNORE ],
+    [ { :a => 1, "b" => 2 }, "'{\"a\":1,\"b\":2}'", :IGNORE ],
   ].each do | value, sql, return_value |
     it "can handle encoding #{value.class.name} value #{value.inspect} as #{sql.inspect}." do
       conn.escape_value(value).should == sql
     end
     it "can handle decoding #{value.class.name} value #{value.inspect}." do
+      pending :if => return_value == :IGNORE
       sql_x = conn.escape_value(value)
       r = conn.run "SELECT #{sql_x}"
       r = r.rows.first.values.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qreport
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -162,12 +162,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2296611255217817535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2296611255217817535
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25