Skip to content

Commit 0ce39ae

Browse files
committed
Merge branch 'main' into feature/mssql-queries
2 parents 84a1484 + 1fd2c01 commit 0ce39ae

File tree

6 files changed

+33
-21
lines changed

6 files changed

+33
-21
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Install Java 11 (Ubuntu 22.04 has Java 17 by default)
2626
name: Install OpenJDK 11
2727
command: |
28-
sudo apt-get update && sudo apt-get install openjdk-11-jdk
28+
sudo apt-get update && sudo apt-get install -y openjdk-11-jdk
2929
sudo update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
3030
sudo update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
3131
java -version

postgres/scripts/install-dependencies.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ set -o pipefail
66
cd "$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd )"
77

88
if [[ ! -z $(which yum) ]]; then
9-
sudo yum install -y postgresql-devel
9+
sudo yum install -y postgresql-devel postgresql
1010
elif [[ ! -z $(which apt-get) ]]; then
1111
sudo apt-get update
12-
sudo apt-get install -y libpq5
12+
sudo apt-get install -y libpq5 postgresql-client
1313
else
1414
echo "Operating system not supported, please install the dependencies manually"
1515
fi

snb-interactive-pre-generated-data-sets.md

+20-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ This command works on both standalone files (`.tar.zst`) and chunked ones (`.tar
3838
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive/snb-out-sf100-projected-fk.tar.zst
3939
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive/snb-out-sf300-projected-fk.tar.zst
4040

41+
### Raw (up to SF30)
42+
43+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/bi-sf1-raw.tar.zst
44+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/bi-sf3-raw.tar.zst
45+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/bi-sf10-raw.tar.zst
46+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/bi-sf30-raw.tar.zst
47+
4148
### Update streams
4249

4350
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive-updates/interactive-updates-sf1.tar.zst
@@ -50,7 +57,19 @@ This command works on both standalone files (`.tar.zst`) and chunked ones (`.tar
5057
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive-updates/interactive-updates-sf3000.tar.zst
5158
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive-updates/interactive-updates-sf10000.tar.zst
5259

53-
### Parameters
60+
### Factor tables
61+
62+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf1.tar.zst
63+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf3.tar.zst
64+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf10.tar.zst
65+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf30.tar.zst
66+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf100.tar.zst
67+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf300.tar.zst
68+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf1000.tar.zst
69+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf3000.tar.zst
70+
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/bi-pre-audit/factors/factors-sf10000.tar.zst
71+
72+
### Parameters (deprecated)
5473

5574
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive/snb-interactive-parameters-sf1.tar.zst
5675
* https://pub-383410a98aef4cb686f0c7601eddd25f.r2.dev/interactive/snb-interactive-parameters-sf3.tar.zst

umbra/output/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

umbra/queries/interactive-update-1-add-person.sql

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ VALUES
1515
(
1616
:creationDate
1717
, :personId
18-
, :personFirstName
19-
, :personLastName
20-
, :gender
18+
, :personFirstName::varchar
19+
, :personLastName::varchar
20+
, :gender::varchar
2121
, :birthday
22-
, :locationIP
23-
, :browserUsed
22+
, :locationIP::varchar
23+
, :browserUsed::varchar
2424
, :cityId
25-
, :languages
26-
, :emails
25+
, :languages::varchar
26+
, :emails::varchar
2727
);

umbra/scripts/install-dependencies.sh

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,4 @@ set -o pipefail
55

66
cd "$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd )"
77

8-
if [[ ! -z $(which yum) ]]; then
9-
sudo yum install -y postgresql-devel postgresql
10-
elif [[ ! -z $(which apt-get) ]]; then
11-
sudo apt-get update
12-
sudo apt-get install -y libpq5 postgresql-client
13-
else
14-
echo "Operating system not supported, please install the dependencies manually"
15-
fi
16-
17-
pip3 install --user --progress-bar off psycopg
8+
../../postgres/scripts/install-dependencies.sh

0 commit comments

Comments
 (0)