From bd23befbf3cc28a52b7ea3bb4919dd8dcc897634 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat, 16 Apr 2022 14:08:34 -0700
Subject: rename to POSTGRES:{DATABASE-HAS-OWNER,USER-CAN-LOGIN}

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
---
 src/package.lisp           | 4 ++--
 src/property/postgres.lisp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/package.lisp b/src/package.lisp
index b1728aa..f64432a 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -932,9 +932,9 @@
                     #:superuser-is
                     #:has-role
                     #:has-database
-                    #:has-owner
+                    #:database-has-owner
                     #:has-group
-                    #:can-login))
+                    #:user-can-login))
 
   (package :consfigurator.connection.local
            (:export #:local-connection))
diff --git a/src/property/postgres.lisp b/src/property/postgres.lisp
index 4eb4dcd..ed2ef32 100644
--- a/src/property/postgres.lisp
+++ b/src/property/postgres.lisp
@@ -70,7 +70,7 @@
    #?"CREATE DATABASE ${db-name};"
    :unless  #?"SELECT 'yes' FROM pg_database WHERE datname = '${db-name}';"))
 
-(defproplist has-owner :posix (database owner)
+(defproplist database-has-owner :posix (database owner)
   (:desc #?"Postgres database ${database} has owner ${owner}")
   (%run-sql #?"ALTER DATABASE ${database} OWNER TO ${owner}"
             :unless  #?"select 'yes' from pg_database d, pg_authid a
@@ -85,7 +85,7 @@
                        where u.rolname='${user}' and g.rolname='${group}'
                        and m.member=u.oid and m.roleid=g.oid;"))
 
-(defproplist can-login :posix (user)
+(defproplist user-can-login :posix (user)
   "Ensure USER can login to Postgres."
   (:desc #?"Postgres role ${user} can login to database")
   (%run-sql #?"ALTER USER ${user} WITH LOGIN;"
-- 
cgit v1.2.3