Changeset 199

Timestamp:

09/10/06 22:24:56 (2 years ago)

Author:

sandal

Message:

:origin is now optional

Files:

• trunk/lib/ruport/query.rb (modified) (1 diff)
• trunk/test/test_query.rb (modified) (2 diffs)
• trunk/test/test_report.rb (modified) (1 diff)

trunk/lib/ruport/query.rb

@@ -60 +60 @@
-    #
-    #   # uses a SQL file stored on disk
-
+
+
+
+
-    def initialize(sql, options={})
-      options = { :source => :default, :origin => :string }.merge(options)
-@sql = sql
+options[:origin] = :file if sql =~ /.sql$/
-      @statements = SqlSplit.new(get_query(options[:origin],sql))
+      @sql = @statements.join
-      
-      if options[:dsn]

trunk/test/test_query.rb

@@ -20 +20 @@
-    assert_equal([[1,2,3],[4,5,6],[7,8,9]],@query1.result)
-  end
+
+  def test_auto_resolve_file
+    q = Ruport::Query.new "test/samples/query_test.sql"
+    assert_equal "select * from foo", q.sql
+  end
+
-  
-  def test_each
@@ -62 +68 @@
-  end
-
-  def test_to_dataset
-    # query needs to be re-worked for a test like this
-    # to be written
-  end
-
-  def test_caching_triggers
-    assert_nothing_raised { @query1.enable_caching }

trunk/test/test_report.rb

@@ -42 +42 @@
-    }
-    assert_equal "a,b,c\n1,2,3\n4,5,6\n7,8,9\n", 
-
+       
-  end
-