sqlite: output view fields in SQL

Author: djerius

lib/SQL/Translator/Parser/SQLite.pm

@@ -470,7 +470,7 @@ conflict_clause : /on conflict/i conflict_algorigthm
 
 conflict_algorigthm : /(rollback|abort|fail|ignore|replace)/i
 
-parens_field_list : '(' column_list ')'
+parens_field_list  : '(' column_list ')'
     { $item[2] }
 
 column_list : field_name(s /,/)
@@ -556,11 +556,12 @@ trigger_name : qualified_name
 #
 # Create View
 #
-create : CREATE TEMPORARY(?) VIEW view_name AS select_statement
+create : CREATE TEMPORARY(?) VIEW view_name parens_field_list(?) AS select_statement
     {
         push @views, {
             name         => $item[4]->{'name'},
-            sql          => $item[6],
+            fields       => $item[5][0],
+            sql          => $item[7],
             is_temporary => $item[2][0] ? 1 : 0,
         }
     }
@@ -724,6 +725,7 @@ sub parse {
   for my $def (@{ $result->{'views'} || [] }) {
     my $view = $schema->add_view(
       name => $def->{'name'},
+      fields => $def->{'fields'},
       sql  => $def->{'sql'},
     );
   }

lib/SQL/Translator/Producer/SQLite.pm

@@ -158,6 +158,11 @@ sub create_view {
       if exists($extra->{if_not_exists}) && $extra->{if_not_exists};
   $create_view .= " ${view_name}";
 
+  if (my @fields = $view->fields) {
+    my $field_list = join ', ', map { _generator->quote($_) } @fields;
+    $create_view .= " ( ${field_list} )";
+  }
+
   if (my $sql = $view->sql) {
     $create_view .= " AS\n    ${sql}";
   }

t/48xml-to-sqlite.t

@@ -66,7 +66,7 @@ CREATE TABLE "Another" (
 
 DROP VIEW IF EXISTS "email_list";
 
-CREATE VIEW "email_list" AS
+CREATE VIEW "email_list" ( "email" ) AS
     SELECT email FROM Basic WHERE (email IS NOT NULL);
 
 DROP TRIGGER IF EXISTS "foo_trigger";
@@ -118,7 +118,7 @@ eq_or_diff(
   "num" numeric(10,2)
 )>,
     q<DROP VIEW IF EXISTS "email_list">,
-    q<CREATE VIEW "email_list" AS
+    q<CREATE VIEW "email_list" ( "email" ) AS
     SELECT email FROM Basic WHERE (email IS NOT NULL)>,
     q<DROP TRIGGER IF EXISTS "foo_trigger">,
     q<CREATE TRIGGER "foo_trigger" after insert on "Basic" BEGIN update modified=timestamp(); END>,

t/56-sqlite-producer.t

@@ -25,7 +25,7 @@ $SQL::Translator::Producer::SQLite::NO_QUOTES = 0;
   my $view1_sql1  = [ SQL::Translator::Producer::SQLite::create_view($view1, $create_opts) ];
 
   my $view_sql_replace = [
-    'CREATE TEMPORARY VIEW IF NOT EXISTS "view_foo" AS
+    'CREATE TEMPORARY VIEW IF NOT EXISTS "view_foo" ( "id", "name" ) AS
     SELECT id, name FROM thing'
   ];
   is_deeply($view1_sql1, $view_sql_replace, 'correct "CREATE TEMPORARY VIEW" SQL');
@@ -38,7 +38,7 @@ $SQL::Translator::Producer::SQLite::NO_QUOTES = 0;
 
   my $view1_sql2         = [ SQL::Translator::Producer::SQLite::create_view($view2, $create_opts) ];
   my $view_sql_noreplace = [
-    'CREATE VIEW "view_foo" AS
+    'CREATE VIEW "view_foo" ( "id", "name" ) AS
     SELECT id, name FROM thing'
   ];
   is_deeply($view1_sql2, $view_sql_noreplace, 'correct "CREATE VIEW" SQL');

t/57-class-dbi.t

@@ -23,7 +23,7 @@ use SQL::Translator::Producer::SQLite;
   my $view1_sql1  = [ SQL::Translator::Producer::SQLite::create_view($view1, $create_opts) ];
 
   my $view_sql_replace = [
-    'CREATE TEMPORARY VIEW IF NOT EXISTS view_foo AS
+    'CREATE TEMPORARY VIEW IF NOT EXISTS view_foo ( id, name ) AS
     SELECT id, name FROM thing'
   ];
   is_deeply($view1_sql1, $view_sql_replace, 'correct "CREATE TEMPORARY VIEW" SQL');
@@ -36,7 +36,7 @@ use SQL::Translator::Producer::SQLite;
 
   my $view1_sql2         = [ SQL::Translator::Producer::SQLite::create_view($view2, $create_opts) ];
   my $view_sql_noreplace = [
-    'CREATE VIEW view_foo AS
+    'CREATE VIEW view_foo ( id, name ) AS
     SELECT id, name FROM thing'
   ];
   is_deeply($view1_sql2, $view_sql_noreplace, 'correct "CREATE VIEW" SQL');