Skip to content

Commit a611d21

Browse files
Gbgolive (#31)
* first-round * second-set * third-push * push4 * push5 * push6 * push * push * push * push * fixes * fixes * fixes * fixes * fixes * fixes * fixes * terra optimizations * terra fixes * env.sh and fixes * docker login fix * take out vaults for now * fixes * fixes * fixes * fixes * fixes * fixes * fixes * Deploy fixes and new terraform * terraform reorg and fixes * oci_core_services fix * Update core.tf * Update core.tf * Update main-destroy.sh * fixes * Update core.tf * fixes * Update oke-setup.sh * fixes * Boost Node CPU and Memory * Rename states for clarity * Update containerengine.tf * Update main-setup.sh * Build perf and main-setup.sh restart * fix * compute shape and docker login enhancements * Update main-setup.sh * build perf tuning * build fixes * Update build-all.sh * Update oci-cli-cs-key-auth.sh * terraform 3 AD * Update oci-cli-cs-key-auth.sh * Update core.tf * fixes * Update core.tf * fixes Uncomment Internet Gateway Comment DHCP settings Move SSL creation to earlier Add wait for OKE to warm up * fixes PropSetup Back to single domain Wait for OKE nodes msdataworkshop alias cwallet.sso name change remove terraform-orig * fixes wallet.zip VM.Standard.B1.1 image Prune terraform status to 60 characters * fixes add cwallet.sso link rm wallet folder (for security) * fixes Destroy new object atp secrets wait for OKE improved logging and setup handling * minor fixes * Fixes Remove RUN_TYPE for now Execute JAVA_BUILD and NON_JAVA_BUILD from main-setup * Fixes No Key Generated messages Improve end of setup * Update containerengine.tf Change image shape * Fixes Hardening oke-setup Different Shape * Update oke-setup.sh Hardening * Parallel Destroy Make destroy run in parallel * chmod * Update main-setup.sh More hardening * Update main-setup.sh * Update oke-setup.sh More defensive code * Typo * SODA build + cleanup Replace SODA jar with maven dependency Remove old scripts Fix global deploy/undeploy scripts * Reorg Jaeger * Jaeger Fixes * DB Prep in Setup and DB Name Changes Moved DB Setup from Java to Shell Change DB Name to o and i * Fixes and Start of GB Integration * DB Name Changes * Update db-setup.sh Fixes * Update main-setup.sh * Update db-setup.sh * GB Integration and Prop Fixes * fixes * Update oci-cli-cs-key-auth.sh * Removed DB Setup from UI * Update oci-cli-cs-key-auth.sh * Dot Net and Go * Fixes * Update main-setup.sh * Manage Non-Java Builds Better * Update main-destroy.sh * Build Reorg * Update main-setup.sh Reorg password collection * Update main-setup.sh Minor fixes * Minor Fixes * Binding Changes * Fixes * Remove Legacy Code Removed admin-helidon, atp-setup, Removed initContainers from deployment yamls * Fixed inventory-helidon-se * Minor fixes * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update db-setup.sh * Fixes go build.sh fix * Update java-builds.sh * Update non-java-builds.sh * Update oke-setup.sh * Update oke-setup.sh * Update db-setup.sh * Update non-java-builds.sh * Update java-builds.sh * Update non-java-builds.sh * Update java-builds.sh * Update db-setup.sh * Update oke-setup.sh * Update java-builds.sh * Update non-java-builds.sh * Update java-builds.sh * Update non-java-builds.sh * Update oke-setup.sh * Simpler Approach * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh * Update main-setup.sh Remove API Key based authentication as bug is fixed * Update main-destroy.sh Complete API Key removal * Update destroy.sh * Fix Inventory DotNet and Go * Update logback.xml Fixed inventory-helidon-se * Update db-setup.sh Protect password in it contains case special characters Co-authored-by: irina granat <irina.granat@oracle.com>
1 parent fff1bcb commit a611d21

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

grabdish/utils/db-setup.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ END;
266266
/
267267
268268
create table inventory (
269-
inventoryid varchar(16) PRIMARY KEY NOT NULL,
270-
inventorylocation varchar(32),
269+
inventoryid varchar(16) PRIMARY KEY NOT NULL,
270+
inventorylocation varchar(32),
271271
inventorycount integer CONSTRAINT positive_inventory CHECK (inventorycount >= 0) );
272272
273273
insert into inventory values ('sushi', '1468 WEBSTER ST,San Francisco,CA', 0);
@@ -360,7 +360,7 @@ while ! state_done ORDER_PROPAGATION; do
360360
Q=$ORDER_QUEUE
361361
sqlplus /nolog <<!
362362
WHENEVER SQLERROR EXIT 1
363-
connect $U/$DB_PASSWORD@$SVC
363+
connect $U/"$DB_PASSWORD"@$SVC
364364
BEGIN
365365
DBMS_AQADM.add_subscriber(
366366
queue_name=>'$Q',
@@ -394,7 +394,7 @@ while ! state_done INVENTORY_PROPAGATION; do
394394
Q=$INVENTORY_QUEUE
395395
sqlplus /nolog <<!
396396
WHENEVER SQLERROR EXIT 1
397-
connect $U/$DB_PASSWORD@$SVC
397+
connect $U/"$DB_PASSWORD"@$SVC
398398
BEGIN
399399
DBMS_AQADM.add_subscriber(
400400
queue_name=>'$Q',
@@ -424,12 +424,12 @@ while ! state_done DOT_NET_INVENTORY_DB_PROC; do
424424
SVC=$INVENTORY_DB_SVC
425425
sqlplus /nolog <<!
426426
WHENEVER SQLERROR EXIT 1
427-
connect $U/$DB_PASSWORD@$SVC
427+
connect $U/"$DB_PASSWORD"@$SVC
428428
@$GRABDISH_HOME/inventory-dotnet/dequeueenqueue.sql
429429
!
430430
state_set_done DOT_NET_INVENTORY_DB_PROC
431431
done
432432

433433

434434
# DB Setup Done
435-
state_set_done "DB_SETUP"
435+
state_set_done DB_SETUP

0 commit comments

Comments
 (0)