prefix AS only for column aliases

lib/Data/ObjectDriver/SQL.pm

@@ -150,7 +150,7 @@ sub as_subquery {
     my $subquery = '(' . $stmt->as_sql . ')';
     $alias ||= $stmt->as;
     if ($alias) {
-        $subquery .= ' AS ' . $alias;
+        $subquery .= ' '. $alias;
     }
     $subquery;
 }

t/11-sql-with-models.t

@@ -47,7 +47,7 @@ EOF
     $stmt->as('mysubquery');
 
     is(sql_normalize($stmt->as_subquery), sql_normalize(<<'EOF'), 'right sql');
-(SELECT blog.id FROM blog WHERE (blog.name = ?)) AS mysubquery
+(SELECT blog.id FROM blog WHERE (blog.name = ?)) mysubquery
 EOF
 };
 
@@ -87,7 +87,7 @@ SELECT
         FROM entry
         WHERE (entry.blog_id = blog.id) AND (entry.text = ?)
         LIMIT 1
-    ) AS sub_alias
+    ) sub_alias
 FROM blog
 WHERE (blog.name = ?)
 EOF
@@ -119,7 +119,7 @@ SELECT
         FROM entry
         WHERE (entry.blog_id = blog.id) AND (entry.text = ?)
         LIMIT 1
-    ) AS sub_alias
+    ) sub_alias
 FROM blog
 WHERE (blog.name = ?)
 EOF
@@ -153,7 +153,7 @@ EOF
     is sql_normalize($stmt->as_sql), sql_normalize(<<'EOF');
 SELECT
     entry.id, entry.blog_id, entry.title, entry.text, count(*) count,
-    (SELECT blog.id, blog.parent_id, blog.name FROM blog) AS sub
+    (SELECT blog.id, blog.parent_id, blog.name FROM blog) sub
 FROM entry
 GROUP BY blog_id
 HAVING (count(*) = ?) AND (sub = ?)
@@ -186,7 +186,7 @@ FROM blog,
         SELECT entry.id, entry.blog_id, entry.text
         FROM entry
         WHERE (entry.text = ?)
-    ) AS sub
+    ) sub
 WHERE ((blog.id = sub.blog_id)) AND ((blog.id IN (?,?)))
 EOF
 
@@ -224,7 +224,7 @@ FROM blog,
         SELECT entry.id, entry.blog_id
         FROM entry
         WHERE (entry.text = ?)
-    ) AS sub
+    ) sub
 WHERE ((blog.id = sub.blog_id)) AND ((blog.id IN (?,?)))
 EOF
 
@@ -350,10 +350,10 @@ SELECT
     blog.id,
     blog.parent_id,
     blog.name,
-    (SELECT max(id) FROM entry WHERE (entry.blog_id = blog.id) AND (entry.id < ?)) AS sub1
+    (SELECT max(id) FROM entry WHERE (entry.blog_id = blog.id) AND (entry.id < ?)) sub1
 FROM 
     blog,
-    (SELECT entry.id FROM entry WHERE (entry.text = ?)) AS sub2
+    (SELECT entry.id FROM entry WHERE (entry.text = ?)) sub2
 WHERE
     (blog.id IN (SELECT entry.blog_id FROM entry WHERE (entry.text = ?)))
 ORDER BY blog.id ASC, sub1 ASC