From 04c64776efdb3bac26f008c7a78bf69bb07445a4 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Tue, 7 Jun 2016 17:56:21 +0000 Subject: [PATCH] tvplanit: Make the results of all calls to GetNextID an Int64 (for consistency with AddResource etc.). git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4686 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/tvplanit/source/vpadvds.pas | 4 ++-- components/tvplanit/source/vpbaseds.pas | 2 +- components/tvplanit/source/vpbdeds.pas | 4 ++-- components/tvplanit/source/vpdbisamds.pas | 4 ++-- components/tvplanit/source/vpff2ds.pas | 4 ++-- components/tvplanit/source/vpflxds.pas | 4 ++-- components/tvplanit/source/vpsqlds.pas | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/components/tvplanit/source/vpadvds.pas b/components/tvplanit/source/vpadvds.pas index 98f410da4..020301446 100644 --- a/components/tvplanit/source/vpadvds.pas +++ b/components/tvplanit/source/vpadvds.pas @@ -71,7 +71,7 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; - function GetNextID(TableName: string): integer; override; + function GetNextID(TableName: string): int64; override; procedure Load; override; procedure CreateTable(TableName: string); procedure CreateIndexDefs(const TableName : string; @@ -220,7 +220,7 @@ begin end; {=====} -function TVpAdvDataStore.GetNextID(TableName: string): Integer; +function TVpAdvDataStore.GetNextID(TableName: string): Int64; var Query: TAdsQuery; GotIt: Boolean; diff --git a/components/tvplanit/source/vpbaseds.pas b/components/tvplanit/source/vpbaseds.pas index 7efc58d8a..f41ad81bd 100644 --- a/components/tvplanit/source/vpbaseds.pas +++ b/components/tvplanit/source/vpbaseds.pas @@ -228,7 +228,7 @@ type procedure DeregisterAllWatchers; procedure DeregisterWatcher (Watcher : THandle); - function GetNextID(TableName: string): Integer; virtual; abstract; + function GetNextID(TableName: string): Int64; virtual; abstract; property Resources: TVpResources read FResources; procedure Load; virtual; procedure LoadEvents; virtual; abstract; diff --git a/components/tvplanit/source/vpbdeds.pas b/components/tvplanit/source/vpbdeds.pas index 85d4b8f11..1238bc7fd 100644 --- a/components/tvplanit/source/vpbdeds.pas +++ b/components/tvplanit/source/vpbdeds.pas @@ -79,7 +79,7 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; - function GetNextID(TableName: string): integer; override; + function GetNextID(TableName: string): int64; override; procedure Load; override; procedure CreateTable(TableName: string); procedure CreateIndexDefs(const TableName : string; @@ -250,7 +250,7 @@ begin end; {=====} -function TVpBDEDataStore.GetNextID(TableName: string): Integer; +function TVpBDEDataStore.GetNextID(TableName: string): Int64; var Query: TQuery; GotIt: Boolean; diff --git a/components/tvplanit/source/vpdbisamds.pas b/components/tvplanit/source/vpdbisamds.pas index 00d9ffa73..a619850c7 100644 --- a/components/tvplanit/source/vpdbisamds.pas +++ b/components/tvplanit/source/vpdbisamds.pas @@ -75,7 +75,7 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; - function GetNextID(TableName: string): Integer; override; + function GetNextID(TableName: string): Int64; override; procedure Load; override; procedure CreateTable(TableName: string); procedure CreateIndexDefs(const TableName : string; @@ -251,7 +251,7 @@ begin end; {=====} -function TVpDBISAMDataStore.GetNextID(TableName: string): Integer; +function TVpDBISAMDataStore.GetNextID(TableName: string): Int64; var Query: TDBISAMQuery; GotIt: Boolean; diff --git a/components/tvplanit/source/vpff2ds.pas b/components/tvplanit/source/vpff2ds.pas index 3e797b0e1..4963be0b0 100644 --- a/components/tvplanit/source/vpff2ds.pas +++ b/components/tvplanit/source/vpff2ds.pas @@ -77,7 +77,7 @@ type constructor Create(AOwner: TComponent); override; destructor Destroy; override; - function GetNextID(TableName: string): integer; override; + function GetNextID(TableName: string): int64; override; // procedure PurgeResource(Res: TVpResource); override; procedure PurgeEvents(Res: TVpResource); override; @@ -138,7 +138,7 @@ begin end; {=====} -function TVpFF2DataStore.GetNextID(TableName: string): integer; +function TVpFF2DataStore.GetNextID(TableName: string): int64; begin { this is not used in the FlashFiler Datastore as the FlashFiler tables use } { autoincrement fields } diff --git a/components/tvplanit/source/vpflxds.pas b/components/tvplanit/source/vpflxds.pas index 97aa8029f..86aa7c7ed 100644 --- a/components/tvplanit/source/vpflxds.pas +++ b/components/tvplanit/source/vpflxds.pas @@ -161,7 +161,7 @@ type function GetFieldName(Mappings: TCollection; VPField: string): string; - function GetNextID(TableName: string): Integer; override; + function GetNextID(TableName: string): Int64; override; { These are published via the TVpDataSources class, which allows them to } { be clustered in the Object Inspector Don't publish them individually } @@ -2031,7 +2031,7 @@ begin end; {=====} -function TVpFlexDataStore.GetNextID(TableName: string): Integer; +function TVpFlexDataStore.GetNextID(TableName: string): Int64; begin { The FlexDataStore has no idea what type of database you are connected to } { beyond TDataset compatibility, so it cannot presume to generate record } diff --git a/components/tvplanit/source/vpsqlds.pas b/components/tvplanit/source/vpsqlds.pas index 5292470f0..f60017638 100644 --- a/components/tvplanit/source/vpsqlds.pas +++ b/components/tvplanit/source/vpsqlds.pas @@ -106,7 +106,7 @@ type // returns the next id for a store by doing an equivalent of select max(id) from table // and increasing the number by one - function GetNextID(TableName: string): Integer; override; + function GetNextID(TableName: string): Int64; override; // post changes to the store procedure PostResources; override; @@ -333,7 +333,7 @@ begin result:=Stores[TasksTableName].Dataset; end; -function TVPSQLDataStore.GetNextID(TableName: string): Integer; +function TVPSQLDataStore.GetNextID(TableName: string): Int64; var FldName : string; begin