Lots of Postgres fixes:

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Parser / PostgreSQL.pm

diff --git a/lib/SQL/Translator/Parser/PostgreSQL.pm b/lib/SQL/Translator/Parser/PostgreSQL.pm
index 054aaf9..6fcd174 100644 (file)
--- a/lib/SQL/Translator/Parser/PostgreSQL.pm
+++ b/lib/SQL/Translator/Parser/PostgreSQL.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Parser::PostgreSQL;
 
 # -------------------------------------------------------------------
-# $Id: PostgreSQL.pm,v 1.16 2003-06-09 02:41:31 kycl4rk Exp $
+# $Id: PostgreSQL.pm,v 1.27 2003-08-17 00:46:23 rossta Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>,
 #                    Allen Day <allenday@users.sourceforge.net>,
@@ -111,7 +111,7 @@ View table:
 
 use strict;
 use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.16 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.27 $ =~ /(\d+)\.(\d+)/;
 $DEBUG   = 0 unless defined $DEBUG;
 
 use Data::Dumper;
@@ -149,36 +149,42 @@ statement : create
   | grant
   | revoke
   | drop
+  | insert
   | connect
+  | update
   | set
   | <error>
 
 connect : /^\s*\\\connect.*\n/
 
-set : /SET/ /[^;]*/ ';'
+set : /set/i /[^;]*/ ';'
 
-revoke : /revoke/i WORD(s /,/) /on/i table_name /from/i name_with_opt_quotes(s /,/) ';'
+revoke : /revoke/i WORD(s /,/) /on/i TABLE(?) table_name /from/i name_with_opt_quotes(s /,/) ';'
     {
         my $table_name = $item{'table_name'};
         push @{ $tables{ $table_name }{'permissions'} }, {
             type       => 'revoke',
             actions    => $item[2],
-            users      => $item[6],
+            users      => $item[7],
         }
     }
 
-grant : /grant/i WORD(s /,/) /on/i table_name /to/i name_with_opt_quotes(s /,/) ';'
+grant : /grant/i WORD(s /,/) /on/i TABLE(?) table_name /to/i name_with_opt_quotes(s /,/) ';'
     {
         my $table_name = $item{'table_name'};
         push @{ $tables{ $table_name }{'permissions'} }, {
             type       => 'grant',
             actions    => $item[2],
-            users      => $item[6],
+            users      => $item[7],
         }
     }
 
 drop : /drop/i /[^;]*/ ';'
 
+insert : /insert/i /[^;]*/ ';'
+
+update : /update/i /[^;]*/ ';'
+
 #
 # Create table.
 #
@@ -272,7 +278,7 @@ field : comment(s?) field_name data_type field_meta(s?) comment(s?)
             }
             elsif ( $meta->{'type'} eq 'not_null' ) {
                 $null = 0;
-                next;
+#                next;
             }
             elsif ( $meta->{'type'} eq 'primary_key' ) {
                 $is_pk = 1;
@@ -312,7 +318,7 @@ column_constraint : constraint_name(?) column_constraint_type deferrable(?) defe
             name             => $item{'constraint_name'}[0] || '',
             type             => $type,
             expression       => $type eq 'check' ? $expression : '',
-            deferreable      => $item{'deferrable'},
+            deferrable       => $item{'deferrable'},
             deferred         => $item{'deferred'},
             reference_table  => $desc->{'reference_table'},
             reference_fields => $desc->{'reference_fields'},
@@ -326,10 +332,10 @@ constraint_name : /constraint/i name_with_opt_quotes { $item[2] }
 
 column_constraint_type : /not null/i { $return = { type => 'not_null' } }
     |
-    /null/ 
+    /null/i
         { $return = { type => 'null' } }
     |
-    /unique/ 
+    /unique/i
         { $return = { type => 'unique' } }
     |
     /primary key/i 
@@ -379,16 +385,15 @@ data_type : pg_data_type parens_value_list(?)
     }
 
 pg_data_type :
-    /(bigint|int8|bigserial|serial8)/ 
+    /(bigint|int8)/i
         { 
             $return = { 
-                type           => 'integer',
-                size           => [8],
-                auto_increment => 1,
+                type => 'integer',
+                size => [8],
             };
         }
     |
-    /(smallint|int2)/ 
+    /(smallint|int2)/i
         { 
             $return = {
                 type => 'integer', 
@@ -396,79 +401,79 @@ pg_data_type :
             };
         }
     |
-    /int(eger)?|int4/ 
+    /(integer|int4?)/i # interval must come before this
         { 
             $return = {
                 type => 'integer', 
                 size => [4],
             };
         }
-    |
-    /(double precision|float8?)/ 
+    |    
+    /(real|float4)/i
         { 
             $return = {
-                type => 'float', 
-                size => [8],
-            }; 
+                type => 'real', 
+                size => [4],
+            };
         }
     |
-    /(real|float4)/ 
+    /(double precision|float8?)/i
         { 
             $return = {
-                type => 'real', 
-                size => [4],
-            };
+                type => 'float', 
+                size => [8],
+            }; 
         }
     |
-    /serial4?/ 
+    /(bigserial|serial8)/i
         { 
             $return = { 
-                type           => 'integer',
-                size           => [4], 
+                type           => 'integer', 
+                size           => [8], 
                 auto_increment => 1,
             };
         }
     |
-    /bigserial/ 
+    /serial4?/i
         { 
             $return = { 
-                type           => 'integer', 
-                size           => [8], 
+                type           => 'integer',
+                size           => [4], 
                 auto_increment => 1,
             };
         }
     |
-    /(bit varying|varbit)/ 
+    /(bit varying|varbit)/i
         { 
             $return = { type => 'varbit' };
         }
     |
-    /character varying/ 
+    /character varying/i
         { 
             $return = { type => 'varchar' };
         }
     |
-    /char(acter)?/ 
+    /char(acter)?/i
         { 
             $return = { type => 'char' };
         }
     |
-    /bool(ean)?/ 
+    /bool(ean)?/i
         { 
             $return = { type => 'boolean' };
         }
     |
-    /bytea/ 
+    /bytea/i
         { 
             $return = { type => 'bytea' };
         }
     |
-    /timestampz?/ 
+    /(timestamptz|timestamp)/i
         { 
             $return = { type => 'timestamp' };
         }
     |
-    /(bit|box|cidr|circle|date|inet|interval|line|lseg|macaddr|money|numeric|decimal|path|point|polygon|text|time|varchar)/
+    /(bit|box|cidr|circle|date|inet|interval|line|lseg|macaddr|money|numeric|decimal|path|point|polygon|text|timetz|time|varchar)/i
         { 
             $return = { type => $item[1] };
         }
@@ -500,7 +505,7 @@ table_constraint : comment(s?) constraint_name(?) table_constraint_type deferrab
             constraint_type  => $type,
             fields           => $type ne 'check' ? $fields : [],
             expression       => $type eq 'check' ? $expression : '',
-            deferreable      => $item{'deferrable'},
+            deferrable       => $item{'deferrable'},
             deferred         => $item{'deferred'},
             reference_table  => $desc->{'reference_table'},
             reference_fields => $desc->{'reference_fields'},
@@ -527,7 +532,7 @@ table_constraint_type : /primary key/i '(' name_with_opt_quotes(s /,/) ')'
         }
     }
     |
-    /check/ '(' /(.+)/ ')'
+    /check/i '(' /(.+)/ ')'
     {
         $return        =  {
             type       => 'check',
@@ -607,14 +612,14 @@ alter_table : /alter/i /table/i only(?)
 
 only : /only/i
 
-create_table : /create/i /table/i
+create_table : /create/i TABLE
 
 create_index : /create/i /index/i
 
-default_val  : /default/i /(?:')?[\w\d.-]*(?:')?/ 
+default_val  : /default/i /(\d+|'[^']*'|\w+\(.*?\))|\w+/
     { 
-        my $val =  $item[2] || '';
-        $val    =~ s/'//g; 
+        my $val =  defined $item[2] ? $item[2] : '';
+        $val    =~ s/^'|'$//g; 
         $return =  {
             supertype => 'constraint',
             type      => 'default',
@@ -647,6 +652,8 @@ table_option : /inherits/i '(' name_with_opt_quotes(s /,/) ')'
         $return = { type => $item[1] =~ /out/i ? 'without_oids' : 'with_oids' }
     }
 
+TABLE : /table/i
+
 SEMICOLON : /\s*;\n?/
 
 WORD : /\w+/
@@ -666,7 +673,7 @@ VALUE   : /[-+]?\.?\d+(?:[eE]\d+)?/
     { $item[1] }
     | /'.*?'/   # XXX doesn't handle embedded quotes
     { $item[1] }
-    | /NULL/
+    | /null/i
     { 'NULL' }
 
 !;
@@ -697,7 +704,7 @@ sub parse {
         my $tdata =  $result->{ $table_name };
         my $table =  $schema->add_table( 
             name  => $tdata->{'table_name'},
-        ) or die $schema->error;
+        ) or die "Couldn't create table '$table_name': " . $schema->error;
 
         my @fields = sort { 
             $tdata->{'fields'}->{$a}->{'order'} 
@@ -747,7 +754,7 @@ sub parse {
         }
     }
 
-    return $result;
+    return 1;
 }
 
 1;