proto.io 0.0.192 → 0.0.194

package/dist/adapters/storage/progres.mjs

@@ -7,7 +7,7 @@ import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
 import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-ikHjpb6F.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-uHM4KXoV.mjs';
+import { r as resolveColumn, a as resolveDataType$1, g as generateId, Q as QueryValidator } from '../../internals/random-uHM4KXoV.mjs';
 import { P as PVK } from '../../internals/private-CNw40LZ7.mjs';
 
 //
@@ -230,7 +230,7 @@ class QueryCompiler {
                     colname,
                 };
                 if (isRelation(dataType) && dataType.foreignField) {
-                    const targetType = resolveDataType(this.schema, dataType.target, dataType.foreignField);
+                    const targetType = resolveDataType$1(this.schema, dataType.target, dataType.foreignField);
                     if (_.isNil(targetType))
                         throw Error(`Invalid path: ${include}`);
                     if (!isPointer(targetType) && !isRelation(targetType))
@@ -1023,15 +1023,17 @@ class PostgresClientDriver {
         return asyncStream(async function* () {
             const client = db instanceof Pool ? await db.connect() : db;
             const stream = new QueryStream(text, values, { batchSize });
-            client.query(stream);
-            try {
-                yield* IteratorPool(Number.MAX_SAFE_INTEGER, stream);
-            }
-            finally {
-                stream.destroy();
-                if (db instanceof Pool)
-                    client.release();
-            }
+            yield* IteratorPool(Number.MAX_SAFE_INTEGER, async function* () {
+                client.query(stream);
+                try {
+                    yield* stream;
+                }
+                finally {
+                    stream.destroy();
+                    if (db instanceof Pool)
+                        client.release();
+                }
+            });
         });
     }
     async version() {
@@ -2899,6 +2901,21 @@ class PostgresStorageTransaction extends PostgresStorageClient {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
+const resolveDataType = (schema, path) => {
+    let fields = schema.fields;
+    let last;
+    for (const key of _.toPath(path)) {
+        const dataType = fields[key];
+        if (_.isNil(dataType))
+            throw Error(`Invalid path: ${path}`);
+        if (isPrimitive(dataType) || isVector(dataType))
+            return dataType;
+        if (!isShape(dataType))
+            return dataType;
+        fields = dataType.shape;
+    }
+    return last;
+};
 class PostgresStorage extends PostgresStorageClient {
     constructor(config) {
         super(new PostgresDriver(config));
@@ -3004,7 +3021,9 @@ class PostgresStorage extends PostgresStorageClient {
             ],
         };
     }
-    _indexBasicName(className, keys) {
+    _indexBasicName(className, keys, unique) {
+        if (unique)
+            return `${className}$u$${_.map(keys, (v, k) => `${k}:${v}`).join('$')}`;
         return `${className}$b$${_.map(keys, (v, k) => `${k}:${v}`).join('$')}`;
     }
     _indexVectorName(className, keys) {
@@ -3026,7 +3045,7 @@ class PostgresStorage extends PostgresStorageClient {
                     names.push(..._.values(this._indexVectorName(className, _.castArray(index.keys))));
                     break;
                 default:
-                    names.push(this._indexBasicName(className, index.keys));
+                    names.push(this._indexBasicName(className, index.keys, !!index.unique));
                     break;
             }
         }
@@ -3122,16 +3141,20 @@ class PostgresStorage extends PostgresStorageClient {
                     break;
                 default:
                     {
-                        const name = this._indexBasicName(className, index.keys);
-                        const isAcl = _.isEqual(index.keys, { _rperm: 1 }) || _.isEqual(index.keys, { _wperm: 1 });
-                        const isRelation = _.has(relations, _.last(_.keys(index.keys)));
+                        const name = this._indexBasicName(className, index.keys, !!index.unique);
+                        const useGin = _.some(_.keys(index.keys), column => {
+                            const dataType = resolveDataType(schema, column);
+                            if (!dataType || isShape(dataType))
+                                throw Error('Invalid index type');
+                            return _isTypeof(dataType, 'string[]') || _.has(relations, column);
+                        });
                         await this.query(sql `
               CREATE ${{ literal: index.unique ? 'UNIQUE' : '' }} INDEX CONCURRENTLY
               IF NOT EXISTS ${{ identifier: name }}
               ON ${{ identifier: className }}
-              ${{ literal: isAcl || isRelation ? 'USING GIN' : '' }}
+              ${{ literal: useGin ? 'USING GIN' : '' }}
               (${_.map(index.keys, (v, k) => sql `
-                ${{ identifier: k }} ${{ literal: isAcl || isRelation ? '' : v === 1 ? 'ASC' : 'DESC' }}
+                ${{ identifier: k }} ${{ literal: useGin ? '' : v === 1 ? 'ASC' : 'DESC' }}
               `)})
             `);
                     }