Merge branch 'develop' of https://github.com/jalissonmello/apgdiff in…

…to develop

.gitignore

@@ -6,3 +6,5 @@ build
 .classpath
 .project
 dist
+.idea/
+*.iml

README.md

@@ -7,9 +7,27 @@ file it at https://github.com/fordfrog/apgdiff/issues. If you for some reason
 need to contact author of this application, you can email him at
 [email protected].
 
+This repo is mainly unmaintained. But if you found a bug and create a pull request chances are good that it will be merged.
+
 ## Changelog
 
-### Version 2.5 (not released yet)
+### Version 2.6
+
+#### New Features 
+* PostgresSQL 10 Support
+* Update dependencies to development with Java 11
+* Add security barrier and another options to Views
+* Add support to Create/Drop Rule
+* Triggers: Rerencing,Enable,Disable
+* use using column::type to cast the type of column
+
+#### Fixes
+* Fix GRANT SEQUENCE, ALTER VIEW OWNER, GRANT(cols) errors
+
+#### Tasks Done
+* Remove SourceForge repository
+
+### Version 2.5
 
 #### New Features
 * MATERIALIZED VIEW support in PostgreSQL 9.3 (Marti Raudsepp)
@@ -40,6 +58,8 @@ [email protected].
 * Fixed issue with the $ sign in the object name (Anatoliy Basov)
 * Added French translation. (Jeremy Passeron)
 * Native for OS line endings in resulting diff (Sergej Bonich)
+* Add support for new Postgres schema dump format
+* Support for Postgres 10 CREATE SEQUENCE data type
 
 ### 2012-09-21: Version 2.4
 

src/main/java/cz/startnet/utils/pgdiff/schema/PgConstraint.java

@@ -53,6 +53,7 @@ public PgConstraint(String name) {
     public String getCreationSQL() {
         final StringBuilder sbSQL = new StringBuilder(100);
         sbSQL.append("ALTER TABLE ");
+        sbSQL.append(PgDiffUtils.getDropIfExists());
         sbSQL.append(PgDiffUtils.getQuotedName(getTableName()));
         sbSQL.append(System.getProperty("line.separator"));
         sbSQL.append("\tADD CONSTRAINT ");
@@ -120,6 +121,7 @@ public String getDefinition() {
     public String getDropSQL() {
         final StringBuilder sbSQL = new StringBuilder(100);
         sbSQL.append("ALTER TABLE ");
+        sbSQL.append(PgDiffUtils.getDropIfExists());
         sbSQL.append(PgDiffUtils.getQuotedName(getTableName()));
         sbSQL.append(System.getProperty("line.separator"));
         sbSQL.append("\tDROP CONSTRAINT ");

src/test/java/cz/startnet/utils/pgdiff/loader/PgDumpLoaderTest.java

@@ -5,13 +5,14 @@
  */
 package cz.startnet.utils.pgdiff.loader;
 
-import java.util.Arrays;
-import java.util.Collection;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 /**
  * Tests for PgDiffLoader class.
  *
@@ -44,7 +45,8 @@ public static Collection<?> parameters() {
                     {13},
                     {14},
                     {15},
-                    {16}
+                    {16},
+                    {18}
                 });
     }
     /**

src/test/resources/cz/startnet/utils/pgdiff/add_comment_new_column_diff.sql

@@ -1,4 +1,6 @@
 ALTER TABLE agent
 	ADD COLUMN IF NOT EXISTS abc BIGINT;
 
+COMMENT ON COLUMN agent.id IS 'This ID support schema name';
+
 COMMENT ON COLUMN agent.abc IS 'This agent supports credit system or not.';

src/test/resources/cz/startnet/utils/pgdiff/add_comment_new_column_new.sql

@@ -2,4 +2,5 @@ CREATE TABLE public."agent"(
   id BIGINT,
   abc BIGINT
 );
-COMMENT ON COLUMN "agent"."abc" IS 'This agent supports credit system or not.';
+COMMENT ON COLUMN "agent"."abc" IS 'This agent supports credit system or not.';
+COMMENT ON COLUMN "public"."agent"."id" IS 'This ID support schema name';

src/test/resources/cz/startnet/utils/pgdiff/add_constraint_diff.sql

@@ -1,3 +1,3 @@
 
-ALTER TABLE testtable
+ALTER TABLE IF EXISTS testtable
 	ADD CONSTRAINT IF NOT EXISTS field4check CHECK (((field4 > (-5.0)::double precision) AND (field4 < (5.0)::double precision)));

src/test/resources/cz/startnet/utils/pgdiff/add_table_bug102_diff.sql

@@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS "procedureresult$Operation" (
 
 ALTER TABLE "procedureresult$Operation" OWNER TO fordfrog;
 
-ALTER TABLE "procedureresult$Operation"
+ALTER TABLE IF EXISTS "procedureresult$Operation"
 	ADD CONSTRAINT IF NOT EXISTS $1 FOREIGN KEY (result_id) REFERENCES testtable(field1) ON UPDATE RESTRICT ON DELETE RESTRICT;

src/test/resources/cz/startnet/utils/pgdiff/add_unique_constraint_diff.sql

@@ -1,6 +1,6 @@
 
-ALTER TABLE inventoryitemsupplier
+ALTER TABLE IF EXISTS inventoryitemsupplier
 	ADD CONSTRAINT IF NOT EXISTS inventoryitemsupplier_pkey PRIMARY KEY (id);
 
-ALTER TABLE inventoryitemsupplier
+ALTER TABLE IF EXISTS inventoryitemsupplier
 	ADD CONSTRAINT IF NOT EXISTS inventoryitemsupplier_5a808b9c_key UNIQUE (inventoryitemid, partneridentificationid);

src/test/resources/cz/startnet/utils/pgdiff/drop_constraint_diff.sql

@@ -1,3 +1,3 @@
 
-ALTER TABLE testtable
+ALTER TABLE IF EXISTS testtable
 	DROP CONSTRAINT IF EXISTS field4check;

src/test/resources/cz/startnet/utils/pgdiff/loader/schema_18.sql

@@ -0,0 +1,39 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 9.5.13
+-- Dumped by pg_dump version 9.5.13
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET row_security = off;
+
+CREATE TABLE public.locations (
+    id uuid NOT NULL,
+    square_feet integer DEFAULT 0 NOT NULL,
+    name character varying(50),
+    description character varying(255),
+    site_id uuid NOT NULL,
+    default_yearly_hours integer,
+    epact_code_name character varying,
+    savings_percent double precision,
+    ceiling_height integer DEFAULT 0 NOT NULL,
+    map_number integer,
+    project_id uuid,
+    notes character varying,
+    existing_controls boolean DEFAULT false NOT NULL,
+    fixture_height integer DEFAULT 0 NOT NULL,
+    luminescence character varying(255)
+);
+
+--
+-- Name: COLUMN locations.default_yearly_hours; Type: COMMENT; Schema: public; Owner: postgres
+--
+
+COMMENT ON COLUMN public.locations.default_yearly_hours IS 'Informs audit items on what their default yearly hours should be';

src/test/resources/cz/startnet/utils/pgdiff/modify_constraint_diff.sql

@@ -1,6 +1,6 @@
 
-ALTER TABLE testtable
+ALTER TABLE IF EXISTS testtable
 	DROP CONSTRAINT IF EXISTS field4check;
 
-ALTER TABLE testtable
+ALTER TABLE IF EXISTS testtable
 	ADD CONSTRAINT IF NOT EXISTS field4check CHECK ((field4 > (0.0)::double precision));