Skip to content

Commit c63810d

Browse files
SimonGoringSimonGoring
committed
Modified a number of functions, mostly to fix , but some just fixed spacing issues or merge conflicts.
1 parent 17e5685 commit c63810d

19 files changed

+31
-57
lines changed

‎function/ts/deleteanalysisunit.sql‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
<<<<<<< HEAD
2-
CREATE OR REPLACE FUNCTION ts.deleteanalysisunit(_analunitid integer)
3-
=======
4-
DROP FUNCTION ts.deleteanalysisunit (integer);
5-
61
CREATE OR REPLACE FUNCTION ts.deleteanalysisunit (_analunitid integer)
7-
>>>>>>> Anna_SQL
82
RETURNS void
93
LANGUAGE sql
104
AS $function$

‎function/ts/deletedata.sql‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
CREATE OR REPLACE FUNCTION ts.deletedata(_dataid integer)
3-
=======
41
CREATE OR REPLACE FUNCTION ts.deletedata (_dataid integer)
5-
>>>>>>> Anna_SQL
62
RETURNS void
73
LANGUAGE sql
84
AS $function$

‎function/ts/deletedataprocessor.sql‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
CREATE OR REPLACE FUNCTION ts.deletedataprocessor(_datasetid integer, _contactid integer)
3-
=======
41
CREATE OR REPLACE FUNCTION ts.deletedataprocessor (_datasetid integer, _contactid integer)
5-
>>>>>>> Anna_SQL
62
RETURNS void
73
LANGUAGE sql
84
AS $function$

‎function/ts/deletedataset.sql‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
<<<<<<< HEAD
2-
CREATE OR REPLACE FUNCTION ts.deletedataset(_datasetid integer)
3-
=======
41
CREATE OR REPLACE FUNCTION ts.deletedataset (_datasetid integer)
5-
>>>>>>> Anna_SQL
62
RETURNS void
73
LANGUAGE sql
84
AS $function$
9-
DELETE FROM ndb.samples AS ss
10-
WHERE ss.datasetid = _datasetid;
11-
DELETE FROM ndb.datasets AS ds
12-
WHERE ds.datasetid = _datasetid;
5+
DELETE FROM ndb.samples AS ss
6+
WHERE ss.datasetid = _datasetid;
7+
DELETE FROM ndb.datasets AS ds
8+
WHERE ds.datasetid = _datasetid;
139
$function$

‎function/ts/deletedatasettaxonnotes.sql‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
CREATE OR REPLACE FUNCTION ts.deletedatasettaxonnotes(_datasetid integer, _taxonid integer, _contactid integer)
3-
=======
41
CREATE OR REPLACE FUNCTION ts.deletedatasettaxonnotes (_datasetid integer, _taxonid integer, _contactid integer)
5-
>>>>>>> Anna_SQL
62
RETURNS void
73
LANGUAGE sql
84
AS $function$

‎function/ts/deleterelativeagepublication.sql‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
CREATE OR REPLACE FUNCTION ts.deleterelativeagepublication(_relativeageid integer, _publicationid integer)
3-
=======
41
CREATE OR REPLACE FUNCTION ts.deleterelativeagepublication (_relativeageid integer, _publicationid integer)
5-
>>>>>>> Anna_SQL
62
RETURNS void
73
LANGUAGE sql
84
AS $function$

‎function/ts/insertanalysisunit.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CREATE OR REPLACE FUNCTION ts.insertanalysisunit(
77
_mixed smallint = null,
88
_igsn character varying = null,
99
_notes character varying = null)
10-
RETURNS void
10+
RETURNS integer
1111
LANGUAGE sql
1212
AS $function$
1313
INSERT INTO ndb.analysisunits

‎function/ts/insertanalysisunitaltdepthscale.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ CREATE OR REPLACE FUNCTION ts.insertanalysisunitaltdepthscale(
33
_altdepthname character varying,
44
_variableunitsid integer,
55
_notes character varying = null)
6-
RETURNS void
6+
RETURNS integer
77
LANGUAGE sql
88
AS $function$
9-
INSERT INTO ndb.analysisunitaltdepthscales(altdepthid, altdepthname, variableunitsid, notes)
10-
VALUES (_altdepthid, _altdepthname, _variableunitsid, _notes)
11-
RETURNING altdepthscaleid
9+
INSERT INTO ndb.analysisunitaltdepthscales(altdepthid, altdepthname, variableunitsid, notes)
10+
VALUES (_altdepthid, _altdepthname, _variableunitsid, _notes)
11+
RETURNING altdepthscaleid
1212
$function$;

‎function/ts/insertcalibrationprogram.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CREATE OR REPLACE FUNCTION ts.insertcalibrationprogram(_calibrationprogram character varying, _version character varying)
2-
RETURNS void
2+
RETURNS integer
33
LANGUAGE sql
44
AS $function$
5-
INSERT INTO ndb.calibrationprograms (calibrationprogram, version)
6-
VALUES (_calibrationprogram, _version)
7-
RETURNING calibrationprogramid
5+
INSERT INTO ndb.calibrationprograms (calibrationprogram, version)
6+
VALUES (_calibrationprogram, _version)
7+
RETURNING calibrationprogramid
88
$function$;

‎function/ts/insertchroncontrol.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CREATE OR REPLACE FUNCTION ts.insertchroncontrol(
99
_agelimityounger float = null,
1010
_agelimitolder float = null,
1111
_notes character varying = null)
12-
RETURNS void
12+
RETURNS integer
1313
LANGUAGE sql
1414
AS $function$
1515
INSERT INTO ndb.chroncontrols(

0 commit comments

Comments
 (0)