Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
FxKu committed Mar 13, 2018
2 parents 7e673f7 + 9a299f1 commit cba1c9c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Oracle/SQLScripts/PL_SQL/CITYDB_PKG/INDEX/IDX.sql
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ AS

IF citydb_util.versioning_table(idx_table_name, schema_name) = 'ON' THEN
internal_table_name := internal_table_name || '_LT';
END IF;
END IF;

SELECT
upper(index_type),
Expand Down Expand Up @@ -409,7 +409,7 @@ AS
sql_error_code VARCHAR2(20);
BEGIN
idx_log := STRARRAY();

FOR rec IN
(SELECT * FROM index_table WHERE (obj).type = idx_type)
LOOP
Expand All @@ -421,7 +421,7 @@ AS
|| ':' || rec.obj.table_name
|| ':' || rec.obj.attribute_name
|| ':' || sql_error_code;
END LOOP;
END LOOP;

RETURN idx_log;
END;
Expand Down Expand Up @@ -550,7 +550,7 @@ AS
FUNCTION get_index(
idx_table_name VARCHAR2,
idx_column_name VARCHAR2
) RETURN INDEX_OBJ
) RETURN INDEX_OBJ
IS
idx INDEX_OBJ;
BEGIN
Expand Down
14 changes: 7 additions & 7 deletions PostgreSQL/SQLScripts/PL_pgSQL/CITYDB_PKG/INDEX/IDX.sql
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
******************************************************************/
DROP TYPE IF EXISTS citydb_pkg.INDEX_OBJ CASCADE;
CREATE TYPE citydb_pkg.INDEX_OBJ AS (
index_name TEXT,
table_name TEXT,
attribute_name TEXT,
type NUMERIC(1),
srid INTEGER,
is_3d NUMERIC(1, 0)
index_name TEXT,
table_name TEXT,
attribute_name TEXT,
type NUMERIC(1),
srid INTEGER,
is_3d NUMERIC(1, 0)
);

/******************************************************************
Expand Down Expand Up @@ -200,7 +200,7 @@ CREATE OR REPLACE FUNCTION citydb_pkg.index_status(
DECLARE
is_valid BOOLEAN;
status TEXT;
BEGIN
BEGIN
SELECT
pgi.indisvalid
INTO
Expand Down

0 comments on commit cba1c9c

Please sign in to comment.