From dd0ed462f1b85b67c963b4cb2878d3ec4429479b Mon Sep 17 00:00:00 2001 From: Ruslan Talpa Date: Thu, 21 Jun 2018 13:05:58 +0300 Subject: [PATCH] fix bug on column comment parser --- src/main/java/cz/startnet/utils/pgdiff/parsers/Parser.java | 5 +++++ .../resources/cz/startnet/utils/pgdiff/add_comments_diff.sql | 2 ++ .../resources/cz/startnet/utils/pgdiff/add_comments_new.sql | 1 + 3 files changed, 8 insertions(+) diff --git a/src/main/java/cz/startnet/utils/pgdiff/parsers/Parser.java b/src/main/java/cz/startnet/utils/pgdiff/parsers/Parser.java index 71017b07..fa9fe7d3 100644 --- a/src/main/java/cz/startnet/utils/pgdiff/parsers/Parser.java +++ b/src/main/java/cz/startnet/utils/pgdiff/parsers/Parser.java @@ -143,6 +143,11 @@ public String parseIdentifier() { identifier += '.' + parseIdentifierInternal(); } + if (string.charAt(position) == '.') { + position++; + identifier += '.' + parseIdentifierInternal(); + } + skipWhitespace(); return identifier; diff --git a/src/test/resources/cz/startnet/utils/pgdiff/add_comments_diff.sql b/src/test/resources/cz/startnet/utils/pgdiff/add_comments_diff.sql index aa71b16a..491a3e26 100644 --- a/src/test/resources/cz/startnet/utils/pgdiff/add_comments_diff.sql +++ b/src/test/resources/cz/startnet/utils/pgdiff/add_comments_diff.sql @@ -14,6 +14,8 @@ COMMENT ON VIEW test_view IS 'test view'; COMMENT ON COLUMN test_view.id IS 'view id col'; +COMMENT ON COLUMN test_view.text IS 'view text col'; + COMMENT ON FUNCTION test_fnc(arg character varying) IS 'test function'; COMMENT ON CONSTRAINT text_check ON test IS 'text check'; diff --git a/src/test/resources/cz/startnet/utils/pgdiff/add_comments_new.sql b/src/test/resources/cz/startnet/utils/pgdiff/add_comments_new.sql index 8abfd0fc..8477dc42 100644 --- a/src/test/resources/cz/startnet/utils/pgdiff/add_comments_new.sql +++ b/src/test/resources/cz/startnet/utils/pgdiff/add_comments_new.sql @@ -70,6 +70,7 @@ COMMENT ON VIEW test_view IS 'test view'; COMMENT ON COLUMN test_view.id IS 'view id col'; +COMMENT ON COLUMN public.test_view.text IS 'view text col'; ALTER TABLE test ALTER COLUMN id SET DEFAULT nextval('test_id_seq'::regclass);