#112 negative argument as IDENTITY (#149)

* support IDENTITY with negative arguments; detect end of table more generically
* Add tests
* rebase patch by potrusil-osi

Co-authored-by: Tomas Potrusil <[email protected]>

Author: madtibo

contributors

@@ -16,6 +16,7 @@ bsacks99
 keyjote
 mark-jay
 mikes-gh
+postrusil-osi
 sebpcspkr
 stuey1978
 

regression/issue_112.sql

@@ -0,0 +1,46 @@
+CREATE TABLE [dbo].[AFElementAttributeCategory](
+	[rid] [bigint] IDENTITY(-1,-1) NOT NULL,
+	[id] [uniqueidentifier] NOT NULL,
+	[rowversion] [timestamp] NOT NULL,
+	[fkelementversionid] [bigint] NOT NULL,
+	[fkparentattributeid] [uniqueidentifier] NULL,
+	[fkcategoryid] [uniqueidentifier] NOT NULL,
+	[changedby] [int] NOT NULL,
+ CONSTRAINT [PK_AFElementAttributeCategory] PRIMARY KEY CLUSTERED 
+(
+	[rid] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [ASSETS]
+) ON [ASSETS]
+GO
+
+CREATE TABLE [dbo].[AFCaseAdjustment](
+	[rid] [bigint] IDENTITY(-1,-1) NOT NULL,
+	[id] [uniqueidentifier] NOT NULL,
+	[rowversion] [timestamp] NOT NULL,
+	[fkcaseid] [bigint] NOT NULL,
+	[attributeid] [uniqueidentifier] NOT NULL,
+	[adjustedvalue] [varbinary](max) NULL,
+	[comment] [nvarchar](1000) NULL,
+	[previousvalue] [varbinary](max) NULL,
+	[creator] [nvarchar](50) NULL,
+	[creationdate] [datetime2](7) NULL,
+	[changedby] [int] NOT NULL,
+ CONSTRAINT [PK_AFCaseAdjustment] PRIMARY KEY NONCLUSTERED 
+(
+	[rid] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [ANALYSIS]
+) ON [ANALYSIS] TEXTIMAGE_ON [ANALYSIS]
+GO
+
+CREATE TABLE [dbo].[sd](
+	[rid] [int] IDENTITY(1000,1) NOT NULL,
+	[rowversion] [timestamp] NOT NULL,
+	[sd] [nvarchar](max) NOT NULL,
+	[ownerRights] [int] NOT NULL,
+	[lupd] [datetime2](7) NULL,
+ CONSTRAINT [pk_sd] PRIMARY KEY CLUSTERED 
+(
+	[rid] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [ASSETS]
+) ON [ASSETS] TEXTIMAGE_ON [ASSETS]
+GO

sqlserver2pgsql.pl

@@ -1348,7 +1348,7 @@ sub add_column_to_table
 
         # We have an identity field. We remember the default value and
         # initialize the sequence correctly in the after script
-        $isidentity =~ /IDENTITY\s*\((\d+),\s*(\d+)\)/
+        $isidentity =~ /IDENTITY\s*\((-?\d+),\s*(-?\d+)\)/
             or die "Cannot understand <$isidentity>";
         my $startseq = $1;
         my $stepseq  = $2;
@@ -1365,8 +1365,6 @@ sub add_column_to_table
 
         $objects->{SCHEMAS}->{$schemaname}->{SEQUENCES}->{$seqname}->{START}
             = $startseq;
-        $objects->{SCHEMAS}->{$schemaname}->{SEQUENCES}->{$seqname}->{MIN}
-            = $startseq;
         $objects->{SCHEMAS}->{$schemaname}->{SEQUENCES}->{$seqname}->{STEP}
             = $stepseq;
         $objects->{SCHEMAS}->{$schemaname}->{SEQUENCES}->{$seqname}
@@ -1449,7 +1447,7 @@ sub parse_dump
                 # column name, typical microsoft stuff :( )
                 # To make matters even worse, they seem to systematically add a space after it :)
                 if ($line =~
-                    /^\s+\[(.*)\]\s*(?:\[(.*)\]\.)?\[(.*)\]\s*(\(.+?\))?(?: COLLATE (\S+))?( IDENTITY\s*\(\d+,\s*\d+\))?(?: ROWGUIDCOL ?)? (?:NOT FOR REPLICATION )?(?:SPARSE +)?(NOT NULL|NULL)(?:\s+CONSTRAINT \[.*\])?(?:\s+DEFAULT \((.*)\))?(?:,|$)?/
+                    /^\s+\[(.*)\]\s*(?:\[(.*)\]\.)?\[(.*)\]\s*(\(.+?\))?(?: COLLATE (\S+))?( IDENTITY\s*\(-?\d+,\s*-?\d+\))?(?: ROWGUIDCOL ?)? (?:NOT FOR REPLICATION )?(?:SPARSE +)?(NOT NULL|NULL)(?:\s+CONSTRAINT \[.*\])?(?:\s+DEFAULT \((.*)\))?(?:,|$)?/
                     )
                 {
                     # Deported into a function because we can also meet alter table add columns on their own
@@ -1983,7 +1981,7 @@ sub parse_dump
         # Added table columns… this seems to appear in SQL Server when some columns have ANSI padding, and some not.
         # PG follows ANSI, that is not an option. The end of the regexp is pasted from the create table
         elsif ($line =~
-            /^ALTER TABLE \[(.*)\]\.\[(.*)\] ADD \[(.*)\] (?:\[(.*)\]\.)?\[(.*)\](\(.+?\))?( IDENTITY\(\d+,\s*\d+\))? (NOT NULL|NULL)(?: CONSTRAINT \[.*\] )?(?: DEFAULT \(.*\))?$/
+            /^ALTER TABLE \[(.*)\]\.\[(.*)\] ADD \[(.*)\] (?:\[(.*)\]\.)?\[(.*)\](\(.+?\))?( IDENTITY\(-?\d+,\s*-?\d+\))? (NOT NULL|NULL)(?: CONSTRAINT \[.*\] )?(?: DEFAULT \(.*\))?$/
             )
         {
             my $schemaname=relabel_schemas($1);
@@ -2883,7 +2881,7 @@ sub generate_schema
 	   # This may not be an identity. Skip it then
 	   next unless defined ($seqref->{OWNERCOL});
 	   print AFTER "select setval('" . format_identifier($schema) . '.'
-	      . format_identifier($sequence) . "',(select max("
+	      . format_identifier($sequence) . "',(select " . ($seqref->{STEP} > 0 ? "max" : "min") . "("
 	      . format_identifier($seqref->{OWNERCOL}) .") from "
 	      . format_identifier($seqref->{OWNERSCHEMA}) . '.'
 	      . format_identifier($seqref->{OWNERTABLE}) . ")::bigint);\n";