na95
diff --git a/‎sqlserver2pgsql.pl‎
Lines changed: 24 additions & 4 deletions b/‎sqlserver2pgsql.pl‎
Lines changed: 24 additions & 4 deletions
@@ -1514,7 +1514,7 @@ sub parse_dump
 
                 }
                 elsif ($line =~
-                       /^\s*(?:CONSTRAINT \[(.*)\] )?PRIMARY KEY (?:NON)?CLUSTERED/)
+                       /^\s*(?:CONSTRAINT \[(.*)\] )?PRIMARY KEY (?:NON)?CLUSTERED(?: HASH)?/)
                 {
                     my $constraint
                         ; # We put everything inside this hashref, we'll push it into the constraint list later
@@ -1823,7 +1823,7 @@ sub parse_dump
         }
 
         elsif ($line =~
-            /^CREATE\s*(UNIQUE )?\s*(NONCLUSTERED|CLUSTERED)?\s*INDEX \[(.*?)\] ON \[(.*?)\]\.\[(.*?)\](\(\[.*?\]\))?/
+            /^\s*CREATE\s*(UNIQUE )?\s*(NONCLUSTERED|CLUSTERED)?\s*INDEX \[(.*?)\] ON \[(.*?)\]\.\[(.*?)\](\(\[.*?\]\))?/
             )
         {
             # Index creation. Index are namespaced per table in SQL Server, not in PostgreSQL
@@ -2249,6 +2249,14 @@ sub parse_dump
             }
         }
 
+				# Save variable for future use
+        elsif ($line =~ /^:setvar\s+(\S+)\s+"(.*)"/)
+				{
+					 my $varname = $1;
+					 my $varvalue = $2;
+					 $objects->{VARIABLES}->{$varname} = $varvalue;
+					 next;
+        }
 
         # Ignore USE, GO, and things that have no meaning for postgresql
         elsif ($line =~
@@ -2444,6 +2452,12 @@ sub generate_schema
         }
     }
 
+		# Set psql variables in UNSURE
+		foreach my $varname (sort keys %{$objects->{VARIABLES}})
+		{
+			 print UNSURE "\\set $varname '$objects->{VARIABLES}->{$varname}'\n";
+		}
+		
     # For the rest, we iterate over schemas, except for array types (no point in complicating this)
     # The tables, columns, etc... will be created in the before script, so there is no dependancy
     # problem with constraints, that will be in the after script, except foreign keys which depend on unique indexes
@@ -2777,9 +2791,15 @@ sub generate_schema
             {
                 my $colref = $refschema->{TABLES}->{$table}->{COLS}->{$col};
                 next unless (defined $colref->{DEFAULT});
+								my $default_value = $colref->{DEFAULT}->{VALUE};
+								if ($default_value =~ /\(\$\((\S+)\)\)/)
+								{
+									 $default_value = ":$1";
+								}
                 my $definition =
-                    "ALTER TABLE " . format_identifier($schema) . '.' . format_identifier($table) . " ALTER COLUMN " . format_identifier($col) . " SET DEFAULT "
-                    . $colref->{DEFAULT}->{VALUE} . ";\n";
+									 "ALTER TABLE " . format_identifier($schema) . '.' . format_identifier($table)
+									 . " ALTER COLUMN " . format_identifier($col)
+									 . " SET DEFAULT " . $default_value . ";\n";
                 if ($colref->{DEFAULT}->{UNSURE})
                 {
                     print UNSURE $definition;
Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,7 @@ sub parse_dump`
`1514`	`1514`
`1515`	`1515`	`}`
`1516`	`1516`	`elsif ($line =~`
`1517`		`- /^\s(?:CONSTRAINT \[(.)\] )?PRIMARY KEY (?:NON)?CLUSTERED/)`
	`1517`	`+ /^\s(?:CONSTRAINT \[(.)\] )?PRIMARY KEY (?:NON)?CLUSTERED(?: HASH)?/)`
`1518`	`1518`	`{`
`1519`	`1519`	`my $constraint`
`1520`	`1520`	`; # We put everything inside this hashref, we'll push it into the constraint list later`
`@@ -1823,7 +1823,7 @@ sub parse_dump`
`1823`	`1823`	`}`
`1824`	`1824`
`1825`	`1825`	`elsif ($line =~`
`1826`		`- /^CREATE\s(UNIQUE )?\s(NONCLUSTERED\|CLUSTERED)?\sINDEX \[(.?)\] ON \[(.?)\]\.\[(.?)\](\(\[.*?\]\))?/`
	`1826`	`+ /^\sCREATE\s(UNIQUE )?\s(NONCLUSTERED\|CLUSTERED)?\sINDEX \[(.?)\] ON \[(.?)\]\.\[(.?)\](\(\[.?\]\))?/`
`1827`	`1827`	`)`
`1828`	`1828`	`{`
`1829`	`1829`	`# Index creation. Index are namespaced per table in SQL Server, not in PostgreSQL`
`@@ -2249,6 +2249,14 @@ sub parse_dump`
`2249`	`2249`	`}`
`2250`	`2250`	`}`
`2251`	`2251`
	`2252`	`+ # Save variable for future use`
	`2253`	`+ elsif ($line =~ /^:setvar\s+(\S+)\s+"(.*)"/)`
	`2254`	`+ {`
	`2255`	`+ my $varname = $1;`
	`2256`	`+ my $varvalue = $2;`
	`2257`	`+ $objects->{VARIABLES}->{$varname} = $varvalue;`
	`2258`	`+ next;`
	`2259`	`+ }`
`2252`	`2260`
`2253`	`2261`	`# Ignore USE, GO, and things that have no meaning for postgresql`
`2254`	`2262`	`elsif ($line =~`
`@@ -2444,6 +2452,12 @@ sub generate_schema`
`2444`	`2452`	`}`
`2445`	`2453`	`}`
`2446`	`2454`
	`2455`	`+ # Set psql variables in UNSURE`
	`2456`	`+ foreach my $varname (sort keys %{$objects->{VARIABLES}})`
	`2457`	`+ {`
	`2458`	`+ print UNSURE "\\set $varname '$objects->{VARIABLES}->{$varname}'\n";`
	`2459`	`+ }`
	`2460`	`+`
`2447`	`2461`	`# For the rest, we iterate over schemas, except for array types (no point in complicating this)`
`2448`	`2462`	`# The tables, columns, etc... will be created in the before script, so there is no dependancy`
`2449`	`2463`	`# problem with constraints, that will be in the after script, except foreign keys which depend on unique indexes`
`@@ -2777,9 +2791,15 @@ sub generate_schema`
`2777`	`2791`	`{`
`2778`	`2792`	`my $colref = $refschema->{TABLES}->{$table}->{COLS}->{$col};`
`2779`	`2793`	`next unless (defined $colref->{DEFAULT});`
	`2794`	`+ my $default_value = $colref->{DEFAULT}->{VALUE};`
	`2795`	`+ if ($default_value =~ /\(\$\((\S+)\)\)/)`
	`2796`	`+ {`
	`2797`	`+ $default_value = ":$1";`
	`2798`	`+ }`
`2780`	`2799`	`my $definition =`
`2781`		`- "ALTER TABLE " . format_identifier($schema) . '.' . format_identifier($table) . " ALTER COLUMN " . format_identifier($col) . " SET DEFAULT "`
`2782`		`- . $colref->{DEFAULT}->{VALUE} . ";\n";`
	`2800`	`+ "ALTER TABLE " . format_identifier($schema) . '.' . format_identifier($table)`
	`2801`	`+ . " ALTER COLUMN " . format_identifier($col)`
	`2802`	`+ . " SET DEFAULT " . $default_value . ";\n";`
`2783`	`2803`	`if ($colref->{DEFAULT}->{UNSURE})`
`2784`	`2804`	`{`
`2785`	`2805`	`print UNSURE $definition;`