@cumulus/db 14.0.0 → 14.1.0

package/dist/lib/granule.d.ts

@@ -4,7 +4,9 @@ import { GranulePgModel } from '../models/granule';
 import { GranulesExecutionsPgModel } from '../models/granules-executions';
 import { PostgresGranule, PostgresGranuleRecord } from '../types/granule';
 import { UpdatedAtRange } from '../types/record';
-export declare const getGranuleCollectionId: (knexOrTransaction: Knex | Knex.Transaction, granule: PostgresGranule) => Promise<string>;
+export declare const getGranuleCollectionId: (knexOrTransaction: Knex, granule: {
+    collection_cumulus_id: number;
+}) => Promise<string>;
 /**
  * Upsert a granule and a record in the granules/executions join table.
  *
@@ -89,7 +91,7 @@ export declare const getGranulesByApiPropertiesQuery: (knex: Knex, { collectionI
  *
  * @param {Knex | Knex.Transaction} knexOrTransaction - DB client or transaction
  * @param {string} granuleId - Granule ID
- * @returns {Promise<Array<PostgresGranuleRecord>} The returned list of records
+ * @returns {Promise<PostgresGranuleRecord[]>} The returned list of records
  */
-export declare const getGranulesByGranuleId: (knexOrTransaction: Knex | Knex.Transaction, granuleId: string) => Promise<Array<PostgresGranuleRecord>>;
+export declare const getGranulesByGranuleId: (knexOrTransaction: Knex | Knex.Transaction, granuleId: string) => Promise<PostgresGranuleRecord[]>;
 //# sourceMappingURL=granule.d.ts.map

package/dist/lib/granule.js

@@ -187,7 +187,7 @@ exports.getGranulesByApiPropertiesQuery = getGranulesByApiPropertiesQuery;
  *
  * @param {Knex | Knex.Transaction} knexOrTransaction - DB client or transaction
  * @param {string} granuleId - Granule ID
- * @returns {Promise<Array<PostgresGranuleRecord>} The returned list of records
+ * @returns {Promise<PostgresGranuleRecord[]>} The returned list of records
  */
 const getGranulesByGranuleId = async (knexOrTransaction, granuleId) => {
     const { granules: granulesTable, } = TableNames;

package/dist/models/base.d.ts

@@ -88,8 +88,8 @@ declare class BasePgModel<ItemType, RecordType extends BaseRecord> {
      * @param {ItemType} item - A record to insert into the DB
      * @param {string | Array<string>} returningFields - A string or array of strings
      *   of columns to return. Defaults to 'cumulus_id'.
-     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects or an
-     *   array of values from the specified column(s) from returningFields.
+     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects
+     *   from the specified column(s) from returningFields.
      */
     create(knexOrTransaction: Knex | Knex.Transaction, item: ItemType, returningFields?: string | string[]): Promise<unknown[] | Object[]>;
     /**
@@ -99,8 +99,8 @@ declare class BasePgModel<ItemType, RecordType extends BaseRecord> {
      * @param {ItemType[]} items - Records to insert into the DB
      * @param {string | Array<string>} returningFields - A string or array of strings
      *   of columns to return. Defaults to 'cumulus_id'.
-     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects or an
-     *   array of values from the specified column(s) from returningFields.
+     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects
+     *   from the specified column(s) from returningFields.
      */
     insert(knexOrTransaction: Knex | Knex.Transaction, items: ItemType[], returningFields?: string | string[]): Promise<unknown[] | Object[]>;
     /**

package/dist/models/base.js

@@ -155,8 +155,8 @@ class BasePgModel {
      * @param {ItemType} item - A record to insert into the DB
      * @param {string | Array<string>} returningFields - A string or array of strings
      *   of columns to return. Defaults to 'cumulus_id'.
-     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects or an
-     *   array of values from the specified column(s) from returningFields.
+     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects
+     *   from the specified column(s) from returningFields.
      */
     async create(knexOrTransaction, item, returningFields = 'cumulus_id') {
         return await knexOrTransaction(this.tableName)
@@ -170,8 +170,8 @@ class BasePgModel {
      * @param {ItemType[]} items - Records to insert into the DB
      * @param {string | Array<string>} returningFields - A string or array of strings
      *   of columns to return. Defaults to 'cumulus_id'.
-     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects or an
-     *   array of values from the specified column(s) from returningFields.
+     * @returns {Promise<unknown[] | Object[]>} Returns an array of objects
+     *   from the specified column(s) from returningFields.
      */
     async insert(knexOrTransaction, items, returningFields = 'cumulus_id') {
         return await knexOrTransaction(this.tableName)

package/dist/models/granule.d.ts

@@ -52,7 +52,7 @@ export default class GranulePgModel extends BasePgModel<PostgresGranule, Postgre
         executionCumulusId?: number;
         executionPgModel?: ExecutionPgModel;
         writeConstraints: boolean;
-    }): Promise<any[]>;
+    }): Promise<PostgresGranuleRecord[]>;
     /**
      * Get granules from the granule cumulus_id
      *

package/dist/models/granule.js

@@ -107,8 +107,7 @@ class GranulePgModel extends base_1.BasePgModel {
                 // exist at all
                 upsertQuery.whereNotExists(exclusionClause);
             }
-            upsertQuery.returning('*');
-            return await upsertQuery;
+            return await upsertQuery.returning('*');
         }
         const upsertQuery = knexOrTrx(this.tableName)
             .insert(granule)
@@ -120,8 +119,7 @@ class GranulePgModel extends base_1.BasePgModel {
             }
             upsertQuery.where(knexOrTrx.raw(`${this.tableName}.created_at <= to_timestamp(${(0, timestamp_1.translateDateToUTC)(granule.created_at)})`));
         }
-        upsertQuery.returning('*');
-        return await upsertQuery;
+        return await upsertQuery.returning('*');
     }
     /**
      * Get granules from the granule cumulus_id

package/dist/models/granules-executions.js

@@ -19,7 +19,8 @@ class GranulesExecutionsPgModel {
         return await knexTransaction(this.tableName)
             .insert(item)
             .onConflict(['granule_cumulus_id', 'execution_cumulus_id'])
-            .merge();
+            .merge()
+            .returning('*');
     }
     /**
      * Get execution_cumulus_id column values from the granule_cumulus_id

package/dist/models/provider.d.ts

@@ -6,9 +6,9 @@ declare class ProviderPgModel extends BasePgModel<PostgresProvider, PostgresProv
     upsert(knexOrTransaction: Knex | Knex.Transaction, provider: PostgresProvider): Knex.QueryBuilder<any, {
         _base: any;
         _hasSelection: true;
-        _keys: "name" | "cumulus_id";
+        _keys: "cumulus_id";
         _aliases: {};
-        _single: true;
+        _single: false;
         _intersectProps: {};
         _unionProps: never;
     }[]>;

package/dist/models/rule.d.ts

@@ -6,9 +6,9 @@ declare class RulePgModel extends BasePgModel<PostgresRule, PostgresRuleRecord>
     upsert(knexOrTransaction: Knex | Knex.Transaction, rule: PostgresRule): Knex.QueryBuilder<any, {
         _base: any;
         _hasSelection: true;
-        _keys: "name" | "cumulus_id";
+        _keys: "cumulus_id";
         _aliases: {};
-        _single: true;
+        _single: false;
         _intersectProps: {};
         _unionProps: never;
     }[]>;

package/dist/test-utils.d.ts

@@ -10,8 +10,8 @@ import { PostgresRule } from './types/rule';
 export declare const createTestDatabase: (knex: Knex, dbName: string, dbUser: string) => Promise<void>;
 export declare const deleteTestDatabase: (knex: Knex, dbName: string) => Promise<any>;
 export declare const generateLocalTestDb: (testDbName: string, migrationDir: string, envParams: object) => Promise<{
-    knex: Knex<any, unknown[]>;
-    knexAdmin: Knex<any, unknown[]>;
+    knex: Knex<any, any[]>;
+    knexAdmin: Knex<any, any[]>;
 }>;
 export declare const destroyLocalTestDb: ({ knex, knexAdmin, testDbName, }: {
     knex: Knex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/db",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "Utilities for working with the Cumulus DB",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -29,15 +29,15 @@
     "node": ">=14.19.1"
   },
   "dependencies": {
-    "@cumulus/aws-client": "14.0.0",
-    "@cumulus/common": "14.0.0",
-    "@cumulus/errors": "14.0.0",
-    "@cumulus/logger": "14.0.0",
-    "@cumulus/message": "14.0.0",
-    "@cumulus/types": "14.0.0",
+    "@cumulus/aws-client": "14.1.0",
+    "@cumulus/common": "14.1.0",
+    "@cumulus/errors": "14.1.0",
+    "@cumulus/logger": "14.1.0",
+    "@cumulus/message": "14.1.0",
+    "@cumulus/types": "14.1.0",
     "crypto-random-string": "^3.2.0",
     "is-valid-hostname": "1.0.2",
-    "knex": "0.95.15",
+    "knex": "2.4.1",
     "lodash": "^4.17.21",
     "pg": "^8.3.0",
     "snake-camel": "^1.0.6",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/uuid": "^8.0.0"
   },
-  "gitHead": "bc0cd0857e007b64e4e8809f7de16a4aeb1e6840"
+  "gitHead": "d97b5b37913944c0f0ecf958f2a567ec3714816c"
 }