filer store: add postgres2

1 files changed, 7 insertions, 48 deletions

diff --git a/weed/filer/postgres/postgres_store.go b/weed/filer/postgres/postgres_store.go
index 8c36b8672..27c6278c7 100644
--- a/weed/filer/postgres/postgres_store.go
+++ b/weed/filer/postgres/postgres_store.go
@@ -14,51 +14,6 @@ const (
 	CONNECTION_URL_PATTERN = "host=%s port=%d sslmode=%s connect_timeout=30"
 )
 
-type SqlGenPostgres struct {
-	createTableSqlTemplate string
-	dropTableSqlTemplate string
-}
-
-var (
-	_ = abstract_sql.SqlGenerator(&SqlGenPostgres{})
-)
-
-func (gen *SqlGenPostgres) GetSqlInsert(bucket string) string {
-	return "INSERT INTO filemeta (dirhash,name,directory,meta) VALUES($1,$2,$3,$4)"
-}
-
-func (gen *SqlGenPostgres) GetSqlUpdate(bucket string) string {
-	return "UPDATE filemeta SET meta=$1 WHERE dirhash=$2 AND name=$3 AND directory=$4"
-}
-
-func (gen *SqlGenPostgres) GetSqlFind(bucket string) string {
-	return "SELECT meta FROM filemeta WHERE dirhash=$1 AND name=$2 AND directory=$3"
-}
-
-func (gen *SqlGenPostgres) GetSqlDelete(bucket string) string {
-	return "DELETE FROM filemeta WHERE dirhash=$1 AND name=$2 AND directory=$3"
-}
-
-func (gen *SqlGenPostgres) GetSqlDeleteFolderChildren(bucket string) string {
-	return "DELETE FROM filemeta WHERE dirhash=$1 AND directory=$2"
-}
-
-func (gen *SqlGenPostgres) GetSqlListExclusive(bucket string) string {
-	return "SELECT NAME, meta FROM filemeta WHERE dirhash=$1 AND name>$2 AND directory=$3 AND name like $4 ORDER BY NAME ASC LIMIT $5"
-}
-
-func (gen *SqlGenPostgres) GetSqlListInclusive(bucket string) string {
-	return "SELECT NAME, meta FROM filemeta WHERE dirhash=$1 AND name>=$2 AND directory=$3 AND name like $4 ORDER BY NAME ASC LIMIT $5"
-}
-
-func (gen *SqlGenPostgres) GetSqlCreateTable(bucket string) string {
-	return fmt.Sprintf(gen.createTableSqlTemplate, bucket)
-}
-
-func (gen *SqlGenPostgres) GetSqlDropTable(bucket string) string {
-	return fmt.Sprintf(gen.dropTableSqlTemplate, bucket)
-}
-
 func init() {
 	filer.Stores = append(filer.Stores, &PostgresStore{})
 }
@@ -78,18 +33,19 @@ func (store *PostgresStore) Initialize(configuration util.Configuration, prefix
 		configuration.GetString(prefix+"hostname"),
 		configuration.GetInt(prefix+"port"),
 		configuration.GetString(prefix+"database"),
+		configuration.GetString(prefix+"schema"),
 		configuration.GetString(prefix+"sslmode"),
 		configuration.GetInt(prefix+"connection_max_idle"),
 		configuration.GetInt(prefix+"connection_max_open"),
 	)
 }
 
-func (store *PostgresStore) initialize(user, password, hostname string, port int, database, sslmode string, maxIdle, maxOpen int) (err error) {
+func (store *PostgresStore) initialize(user, password, hostname string, port int, database, schema, sslmode string, maxIdle, maxOpen int) (err error) {
 
 	store.SupportBucketTable = false
 	store.SqlGenerator = &SqlGenPostgres{
-		createTableSqlTemplate: "",
-		dropTableSqlTemplate: "drop table %s",
+		CreateTableSqlTemplate: "",
+		DropTableSqlTemplate:   "drop table %s",
 	}
 
 	sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, hostname, port, sslmode)
@@ -102,6 +58,9 @@ func (store *PostgresStore) initialize(user, password, hostname string, port int
 	if database != "" {
 		sqlUrl += " dbname=" + database
 	}
+	if schema != "" {
+		sqlUrl += " search_path=" + schema
+	}
 	var dbErr error
 	store.DB, dbErr = sql.Open("postgres", sqlUrl)
 	if dbErr != nil {