Skip to content

Commit 76359be

Browse files
committed
to fix watcher action
1 parent fd47ede commit 76359be

3 files changed

Lines changed: 20 additions & 12 deletions

File tree

README.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,28 @@ softclient4es --host localhost --port 9200
3434
```sql
3535
-- Create a table (index)
3636
CREATE TABLE users (
37-
id KEYWORD PRIMARY KEY,
38-
name TEXT,
37+
id KEYWORD,
38+
name TEXT FIELDS(
39+
raw KEYWORD
40+
) OPTIONS (fielddata = true),
3941
email KEYWORD,
4042
age INTEGER,
41-
created_at DATE
43+
created_at DATE,
44+
PRIMARY KEY (id)
4245
);
4346

4447
-- Insert data
4548
INSERT INTO users (id, name, email, age)
4649
VALUES ('1', 'Alice', 'alice@example.com', 30);
4750

4851
-- Query with SQL
49-
SELECT name, email FROM users WHERE age > 25 ORDER BY name;
52+
SELECT name, email, age FROM users WHERE age > 25 ORDER BY name;
5053

5154
-- Update records
5255
UPDATE users SET age = 31 WHERE id = '1';
5356

5457
-- Show tables
55-
SHOW TABLES;
58+
SHOW TABLES LIKE 'user%';
5659
```
5760

5861
📖 **[Full REPL Documentation](documentation/client/repl.md)**
@@ -78,13 +81,18 @@ SHOW TABLES;
7881

7982
```sql
8083
CREATE TABLE products (
81-
id KEYWORD PRIMARY KEY,
82-
name TEXT,
84+
id KEYWORD,
85+
name TEXT FIELDS(
86+
raw KEYWORD
87+
) OPTIONS (fielddata = true),
88+
email KEYWORD,
8389
price DOUBLE,
84-
tags KEYWORD[]
90+
tags KEYWORD,
91+
PRIMARY KEY (id)
8592
);
8693

8794
ALTER TABLE products ADD COLUMN stock INTEGER;
95+
DESCRIBE TABLE products;
8896
DROP TABLE old_products;
8997
TRUNCATE TABLE logs;
9098
```

core/src/main/scala/app/softnetwork/elastic/client/GatewayApi.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ class TableExecutor(
679679
logger.info(s"♻️ Alter index $indexName.")
680680
alterExistingIndex(indexName, alter)
681681

682-
// 5) Error on indexExists
682+
// 4) Error on indexExists
683683
case ElasticFailure(elasticError) =>
684684
Future.successful(
685685
ElasticFailure(elasticError.copy(operation = Some("schema")))

sql/src/main/scala/app/softnetwork/elastic/sql/watcher/WatcherAction.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ case class LoggingActionConfig(
4040
level: Option[LoggingLevel] = Some(LoggingLevel.INFO)
4141
) extends DdlToken {
4242

43-
def sql: String = s"\"$text\"" + level.map(l => s" AT $l").getOrElse("")
43+
def sql: String = s""""$text"${level.map(l => s" AT $l").getOrElse("")}"""
4444

4545
def node: JsonNode = {
4646
val node = mapper.createObjectNode()
@@ -98,7 +98,7 @@ case class LoggingAction(
9898
) extends WatcherAction {
9999

100100
def sql: String = s"LOG $logging" +
101-
foreach.map(f => s" FOREACH \"$f\"").getOrElse("") +
101+
foreach.map(f => s""" FOREACH "$f"""").getOrElse("") +
102102
limit.map(mi => s" LIMIT $mi").getOrElse("")
103103

104104
override def node: JsonNode = {
@@ -128,7 +128,7 @@ case class WebhookAction(
128128
limit: Option[Int] = None
129129
) extends WatcherAction {
130130
def sql: String = s"WEBHOOK $webhook" +
131-
foreach.map(f => s" FOREACH \"$f\"").getOrElse("") +
131+
foreach.map(f => s""" FOREACH "$f"""").getOrElse("") +
132132
limit.map(mi => s" LIMIT $mi").getOrElse("")
133133

134134
override def node: JsonNode = {

0 commit comments

Comments
 (0)