diff options
| author | jakefeasel <jfeasel@gmail.com> | 2015-04-04 09:06:04 -0700 |
|---|---|---|
| committer | jakefeasel <jfeasel@gmail.com> | 2015-04-04 09:06:04 -0700 |
| commit | 22dfe58363d1bf140df219858656a27c7d767029 (patch) | |
| tree | fe6a4ec925f66019a32638eb3f1a984782fff09c | |
| parent | c2c39c2995a6aa22c5f42ee9a8cccec27dde7839 (diff) | |
| download | sqlfiddle2-22dfe58363d1bf140df219858656a27c7d767029.zip sqlfiddle2-22dfe58363d1bf140df219858656a27c7d767029.tar.gz sqlfiddle2-22dfe58363d1bf140df219858656a27c7d767029.tar.bz2 | |
Better handling of null values for ddl and sql
| -rw-r--r-- | src/main/resources/conf/sync.json | 1 | ||||
| -rw-r--r-- | src/main/resources/script/createSchema.groovy | 2 | ||||
| -rw-r--r-- | src/main/resources/script/executeQuery.groovy | 2 | ||||
| -rw-r--r-- | src/main/resources/script/loadContent.groovy | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/main/resources/conf/sync.json b/src/main/resources/conf/sync.json index 3ffecae..8f7c927 100644 --- a/src/main/resources/conf/sync.json +++ b/src/main/resources/conf/sync.json @@ -47,6 +47,7 @@ }, { "source" : "ddl", + "default" : "", "target" : "ddl" }, { diff --git a/src/main/resources/script/createSchema.groovy b/src/main/resources/script/createSchema.groovy index 4011717..86a50f1 100644 --- a/src/main/resources/script/createSchema.groovy +++ b/src/main/resources/script/createSchema.groovy @@ -114,7 +114,7 @@ try { "schema_name": "db_" + content.db_type_id + "_" + short_code, "username": "user_" + content.db_type_id + "_" + short_code, "pw": content.db_type_id + "_" + short_code, - "ddl": content.ddl, + "ddl": content.ddl ?: "", "statement_separator": content.statement_separator ]) diff --git a/src/main/resources/script/executeQuery.groovy b/src/main/resources/script/executeQuery.groovy index eb360d2..fdcc116 100644 --- a/src/main/resources/script/executeQuery.groovy +++ b/src/main/resources/script/executeQuery.groovy @@ -16,7 +16,7 @@ class PostgreSQLException extends Exception {} def content = request.getContent().asMap() -assert content.sql != null +content.sql = (content.sql ?: "") assert content.db_type_id assert content.schema_short_code diff --git a/src/main/resources/script/loadContent.groovy b/src/main/resources/script/loadContent.groovy index 4890abd..0e13040 100644 --- a/src/main/resources/script/loadContent.groovy +++ b/src/main/resources/script/loadContent.groovy @@ -17,7 +17,7 @@ assert schema_def != null def response = [ "short_code": schema_def.short_code, - "ddl": schema_def.ddl, + "ddl": schema_def.ddl ?: "", "schema_statement_separator": schema_def.statement_separator, "schema_structure": schema_def.structure, "full_name": schema_def.db_type.full_name @@ -29,7 +29,7 @@ if (fragment_parts.size() > 2) { assert query != null response["query_statement_separator"] = query.statement_separator - response["sql"] = query.sql + response["sql"] = query.sql ?: "", response["id"] = query.query_id response["sets"] = openidm.action("endpoint/executeQuery", "query", [ "db_type_id": fragment_parts[0], |