From cbfe1b600f9636f0c60b2bfebea6a2553c06f869 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 4 Feb 2016 15:18:19 +0100 Subject: [PATCH] Moved the interface renderer logic to the client --- client/Makefile | 6 +++--- .../renderer/interfaces/interface_0.0.1.yaml | 0 .../renderer/interfaces/interface_0.1.0.yaml | 0 .../renderer/sql-template-renderer | 0 client/{ => renderer}/templates/20_public_functions.erb | 0 client/{ => renderer}/templates/30_plproxy_functions.erb | 0 client/{ => renderer}/templates/90_grant_execute.erb | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename interface_0.0.1.yaml => client/renderer/interfaces/interface_0.0.1.yaml (100%) rename interface_0.1.0.yaml => client/renderer/interfaces/interface_0.1.0.yaml (100%) rename sql-template-renderer => client/renderer/sql-template-renderer (100%) rename client/{ => renderer}/templates/20_public_functions.erb (100%) rename client/{ => renderer}/templates/30_plproxy_functions.erb (100%) rename client/{ => renderer}/templates/90_grant_execute.erb (100%) diff --git a/client/Makefile b/client/Makefile index a9ff0c0..2d6e96d 100644 --- a/client/Makefile +++ b/client/Makefile @@ -28,9 +28,9 @@ include $(PGXS) SOURCES_DATA_DIR = sql/$(EXTVERSION) # The interface definition is used along with some templates to automatically generate code -RENDERER = ../sql-template-renderer -INTERFACE_FILE = ../interface_$(EXTVERSION).yaml -TEMPLATE_DIR = templates +RENDERER = renderer/sql-template-renderer +INTERFACE_FILE = renderer/interfaces/interface_$(EXTVERSION).yaml +TEMPLATE_DIR = renderer/templates TEMPLATE_FILES = $(wildcard $(TEMPLATE_DIR)/*.erb) GENERATED_SQL_FILES = $(patsubst $(TEMPLATE_DIR)/%.erb, $(SOURCES_DATA_DIR)/%.sql, $(TEMPLATE_FILES)) diff --git a/interface_0.0.1.yaml b/client/renderer/interfaces/interface_0.0.1.yaml similarity index 100% rename from interface_0.0.1.yaml rename to client/renderer/interfaces/interface_0.0.1.yaml diff --git a/interface_0.1.0.yaml b/client/renderer/interfaces/interface_0.1.0.yaml similarity index 100% rename from interface_0.1.0.yaml rename to client/renderer/interfaces/interface_0.1.0.yaml diff --git a/sql-template-renderer b/client/renderer/sql-template-renderer similarity index 100% rename from sql-template-renderer rename to client/renderer/sql-template-renderer diff --git a/client/templates/20_public_functions.erb b/client/renderer/templates/20_public_functions.erb similarity index 100% rename from client/templates/20_public_functions.erb rename to client/renderer/templates/20_public_functions.erb diff --git a/client/templates/30_plproxy_functions.erb b/client/renderer/templates/30_plproxy_functions.erb similarity index 100% rename from client/templates/30_plproxy_functions.erb rename to client/renderer/templates/30_plproxy_functions.erb diff --git a/client/templates/90_grant_execute.erb b/client/renderer/templates/90_grant_execute.erb similarity index 100% rename from client/templates/90_grant_execute.erb rename to client/renderer/templates/90_grant_execute.erb