killbill-aplcache

diff --git a/util/src/main/resources/org/killbill/billing/util/ddl-postgresql.sql b/util/src/main/resources/org/killbill/billing/util/ddl-postgresql.sql
index 4306a96..49d05f7 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl-postgresql.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl-postgresql.sql
@@ -9,6 +9,7 @@ DROP DOMAIN IF EXISTS mediumblob CASCADE;
 CREATE DOMAIN mediumblob AS bytea;
 
 CREATE OR REPLACE LANGUAGE plpgsql;
+
 CREATE OR REPLACE FUNCTION last_insert_id() RETURNS BIGINT AS $$
     DECLARE
         result BIGINT;
@@ -20,3 +21,27 @@ CREATE OR REPLACE FUNCTION last_insert_id() RETURNS BIGINT AS $$
         RETURN result;
     END;
 $$ LANGUAGE plpgsql VOLATILE;
+
+CREATE OR REPLACE FUNCTION schema() RETURNS VARCHAR AS $$
+    DECLARE
+        result VARCHAR;
+    BEGIN
+        SELECT current_schema() INTO result;
+        RETURN result;
+    EXCEPTION WHEN OTHERS THEN
+        SELECT NULL INTO result;
+        RETURN result;
+    END;
+$$ LANGUAGE plpgsql IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION hour(ts TIMESTAMP WITH TIME ZONE) RETURNS INTEGER AS $$
+    DECLARE
+        result INTEGER;
+    BEGIN
+        SELECT EXTRACT(HOUR FROM ts) INTO result;
+        RETURN result;
+    EXCEPTION WHEN OTHERS THEN
+        SELECT NULL INTO result;
+        RETURN result;
+    END;
+$$ LANGUAGE plpgsql IMMUTABLE;

diff --git a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
index 0c4d6ae..96a76e8 100644
--- a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
+++ b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
@@ -55,7 +55,7 @@ public class TestInternalCallContextFactory extends UtilTestSuiteWithEmbeddedDB 
                                "    PRIMARY KEY(record_id)\n" +
                                ");");
                 handle.execute("insert into invoices (id, account_id, invoice_date, target_date, currency, migrated, created_by, created_date, account_record_id) values " +
-                               "(?, ?, now(), now(), 'USD', 0, 'test', now(), ?)", invoiceId.toString(), UUID.randomUUID().toString(), accountRecordId);
+                               "(?, ?, now(), now(), 'USD', false, 'test', now(), ?)", invoiceId.toString(), UUID.randomUUID().toString(), accountRecordId);
                 return null;
             }
         });

diff --git a/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java b/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java
index 30a5ac4..7f1627c 100644
--- a/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java
+++ b/util/src/test/java/org/killbill/billing/util/dao/TestStringTemplateInheritance.java
@@ -63,7 +63,7 @@ public class TestStringTemplateInheritance extends UtilTestSuiteNoDB {
         final StringTemplateGroup kombucha = new StringTemplateGroup(new InputStreamReader(kombuchaStream));
 
         // Verify non inherited template
-        Assert.assertEquals(kombucha.getInstanceOf("isIsTimeForKombucha").toString(), "select hour(current_timestamp()) = 17 as is_time;");
+        Assert.assertEquals(kombucha.getInstanceOf("isIsTimeForKombucha").toString(), "select hour(current_timestamp(0)) = 17 as is_time;");
 
         // Verify inherited templates
         assertPattern(kombucha.getInstanceOf("getById").toString(), "select\r?\n" +

diff --git a/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg b/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg
index 4fe6ff0..cbb4410 100644
--- a/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg
+++ b/util/src/test/resources/org/killbill/billing/util/dao/Kombucha.sql.stg
@@ -17,5 +17,5 @@ tableValues() ::= <<
 >>
 
 isIsTimeForKombucha() ::= <<
-select hour(current_timestamp()) = 17 as is_time;
->>
\ No newline at end of file
+select hour(current_timestamp(0)) = 17 as is_time;
+>>

diff --git a/util/src/test/resources/org/killbill/billing/util/ddl_test.sql b/util/src/test/resources/org/killbill/billing/util/ddl_test.sql
index f548887..9c2ae7b 100644
--- a/util/src/test/resources/org/killbill/billing/util/ddl_test.sql
+++ b/util/src/test/resources/org/killbill/billing/util/ddl_test.sql
@@ -29,8 +29,8 @@ CREATE TABLE kombucha (
     tea varchar(50) NOT NULL,
     mushroom varchar(50) NOT NULL,
     sugar varchar(50) NOT NULL,
-    account_record_id bigint unsigned not null,
-    tenant_record_id bigint unsigned not null default 0,
+    account_record_id bigint /*! unsigned */ not null,
+    tenant_record_id bigint /*! unsigned */ not null default 0,
     PRIMARY KEY(record_id)
 );