Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- run: bash .ci/build.sh
- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.10.0
- uses: js-soft/ferretdb-github-action@1.1.1
- uses: js-soft/ferretdb-github-action@1.1.3
with:
ferretdb-telemetry: "enabled"
ferretdb-port: 27018
Expand Down
17 changes: 4 additions & 13 deletions .local/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,23 @@ services:
- 27020:27017

postgres:
image: postgres
image: ghcr.io/ferretdb/postgres-documentdb:latest
container_name: database-ferretdb-postgres
hostname: postgres
environment:
- POSTGRES_USER=user
- POSTGRES_PASSWORD=password
- POSTGRES_DB=ferretdb
- POSTGRES_DB=postgres

ferret:
image: ghcr.io/ferretdb/ferretdb:latest
container_name: database-ferretdb
ports:
- "27024:27017"
environment:
FERRETDB_POSTGRESQL_URL: postgres://user:password@postgres:5432/ferretdb
FERRETDB_POSTGRESQL_URL: postgres://user:password@postgres:5432/postgres
FERRETDB_TELEMETRY: disable
FERRETDB_LOG_LEVEL: error
FERRETDB_AUTH: false
depends_on:
- postgres

ferret-sqlite:
image: ghcr.io/ferretdb/ferretdb:latest
container_name: database-ferretdb-sqlite
ports:
- "27025:27017"
environment:
FERRETDB_HANDLER: sqlite
FERRETDB_TELEMETRY: disable
FERRETDB_LOG_LEVEL: error
3 changes: 0 additions & 3 deletions .local/testSetupFerretSqlite.sh

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2021 j&s-soft GmbH
Copyright 2021 j&s-soft AG

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
500 changes: 108 additions & 392 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/abstractions/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2021 j&s-soft GmbH
Copyright 2021 j&s-soft AG

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion packages/abstractions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"directory": "packages/abstractions"
},
"license": "MIT",
"author": "j&s-soft GmbH",
"author": "j&s-soft AG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/loki/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2021 j&s-soft GmbH
Copyright 2021 j&s-soft AG

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion packages/loki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"directory": "packages/loki"
},
"license": "MIT",
"author": "j&s-soft GmbH",
"author": "j&s-soft AG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/mongo/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2021 j&s-soft GmbH
Copyright 2021 j&s-soft AG

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
5 changes: 2 additions & 3 deletions packages/mongo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"directory": "packages/mongo"
},
"license": "MIT",
"author": "j&s-soft GmbH",
"author": "j&s-soft AG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
Expand All @@ -20,8 +20,7 @@
"test": "jest",
"test:ci": "npm run test",
"test:local": "../../.local/testSetup.sh && CONNECTION_STRING=\"mongodb://localhost:27020\" npm run test",
"test:local:ferretdb": "../../.local/testSetupFerret.sh && CONNECTION_STRING=\"mongodb://localhost:27024\" npm run test",
"test:local:ferretdb:sqlite": "../../.local/testSetupFerretSqlite.sh && CONNECTION_STRING=\"mongodb://localhost:27025\" npm run test"
"test:local:ferretdb": "../../.local/testSetupFerret.sh && CONNECTION_STRING=\"mongodb://localhost:27024\" npm run test"
},
"jest": {
"preset": "ts-jest",
Expand Down
2 changes: 1 addition & 1 deletion packages/querytranslator/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2021 j&s-soft GmbH
Copyright 2021 j&s-soft AG

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion packages/querytranslator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"directory": "packages/querytranslator"
},
"license": "MIT",
"author": "j&s-soft GmbH",
"author": "j&s-soft AG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
Expand Down