more fixes

Signed-off-by: Jason Etheridge <jason@equinoxinitiative.org>

diff --git a/sql/base/00-infrastructure.sql b/sql/base/00-infrastructure.sql
index 1e2b18f..240a508 100644 (file)
--- a/sql/base/00-infrastructure.sql
+++ b/sql/base/00-infrastructure.sql
@@ -169,7 +169,7 @@ AS $function$
             EXECUTE 'ALTER TABLE ' || columns.table_schema || '.' || columns.table_name || ' ALTER COLUMN ' || columns.column_name || ' DROP NOT NULL;';
         END LOOP;
     END;
-$function$
+$function$;
 
 CREATE OR REPLACE FUNCTION migration_tools.assert (BOOLEAN) RETURNS VOID AS $$
     DECLARE

diff --git a/sql/base/07-eg-specific.sql b/sql/base/07-eg-specific.sql
index b9c7543..805fbe4 100644 (file)
--- a/sql/base/07-eg-specific.sql
+++ b/sql/base/07-eg-specific.sql
@@ -838,10 +838,7 @@ CREATE OR REPLACE FUNCTION migration_tools.set_salted_passwd(INTEGER,TEXT) RETUR
     END;
 $$ LANGUAGE PLPGSQL STRICT VOLATILE;
 
--- convenience functions for handling copy_location maps
-CREATE OR REPLACE FUNCTION migration_tools.handle_shelf (TEXT,TEXT,TEXT,INTEGER) RETURNS VOID AS $$
-    SELECT migration_tools._handle_shelf($1,$2,$3,$4,TRUE);
-$$ LANGUAGE SQL;
+-- internal function for handle_shelf
 
 CREATE OR REPLACE FUNCTION migration_tools._handle_shelf (TEXT,TEXT,TEXT,INTEGER,BOOLEAN) RETURNS VOID AS $$
     DECLARE
@@ -946,6 +943,11 @@ CREATE OR REPLACE FUNCTION migration_tools._handle_shelf (TEXT,TEXT,TEXT,INTEGER
     END;
 $$ LANGUAGE PLPGSQL STRICT VOLATILE;
 
+-- convenience functions for handling copy_location maps
+CREATE OR REPLACE FUNCTION migration_tools.handle_shelf (TEXT,TEXT,TEXT,INTEGER) RETURNS VOID AS $$
+    SELECT migration_tools._handle_shelf($1,$2,$3,$4,TRUE);
+$$ LANGUAGE SQL;
+
 -- convenience functions for handling circmod maps
 
 CREATE OR REPLACE FUNCTION migration_tools.handle_circmod (TEXT,TEXT) RETURNS VOID AS $$