[Squerl] can select from several tables

masak · Sep 24, 2009 · 333c29e · 333c29e
1 parent 97aa3ee
commit 333c29e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/Squerl.pm b/lib/Squerl.pm
@@ -135,12 +135,19 @@ class Squerl::Dataset does Positional {
             if %!opts<from> ~~ Array && %!opts<from>.elems > 1;
     }
 
+    sub source_list(@source) {
+        die 'No source specified for query'
+            if !defined @source || !@source;
+
+        @source.join($COMMA_SEPARATOR);
+    }
+
     method select_sql() {
         return self.static_sql(%!opts<sql>)
             if %!opts.exists('sql');
 
         # RAKUDO: Real string interpolation
-        "SELECT * FROM {%!opts<from>}"
+        "SELECT * FROM {source_list(%!opts<from>.list)}"
         ~ (%!opts.exists('filter')
             ?? " WHERE ({%!opts<filter>.fmt('%s = %s')})"
             !! '');

diff --git a/t/squerl/02-dataset.t b/t/squerl/02-dataset.t
@@ -300,4 +300,9 @@ $dataset = Squerl::Dataset.new(undef).from('t1', 't2');
                      'multi-table dataset dies on .insert_sql';
 }
 
+{
+    is $dataset.select_sql, 'SELECT * FROM t1, t2',
+       'generate a select query FROM all specified tables';
+}
+
 done_testing;