@@ -16,10 +16,11 @@ class Program {
1616 const string Help = "AndlPg <script.ext> [<database name>] [/options]\n "
1717 + "\t \t Script extension must be andl, sql, pgsql or pgs.\n "
1818 + "\t \t Default script is test.andl, database is 'db'.\n "
19- + "\t /d\t Add #source directive for current directory"
20- + "\t /p[o]\t Add Postgres preamble and postamble (o for preamble only)"
21- + "\t /s\t Sql (ignored)"
22- + "\t /n\t n=1 to 4, set tracing level" ;
19+ + "\t \t Hardwired for user postgres, password from pgpass.\n "
20+ + "\t /d\t Add #source directive for current directory\n "
21+ + "\t /p[o]\t Add Postgres preamble and postamble (o for preamble only)\n "
22+ + "\t /s\t Sql (ignored)\n "
23+ + "\t /n\t n=1 to 4, set tracing level (and add #noisy directive)" ;
2324 static readonly Dictionary < string , Action < string > > _options = new Dictionary < string , Action < string > > {
2425 { "p" , ( a ) => { _usepreamble = true ; _usepostamble = ( a != "o" ) ; } } ,
2526 { "d" , ( a ) => { AddSource = true ; } } ,
@@ -47,13 +48,14 @@ static void Main(string[] args) {
4748 if ( ! File . Exists ( path ) ) throw ProgramError . Fatal ( $ "file does not exist: { path } ") ;
4849 var input = new StreamReader ( path ) . ReadToEnd ( ) ;
4950
50- var conn = ConnectionInfo . Create ( "localhost" , "postgres" , "zzxx" , database ) ;
51+ var conn = ConnectionInfo . Create ( "localhost" , "postgres" , database ) ;
5152 var pgw = WrapLibpq . Create ( conn , _output ) ;
5253 // use npgsql instead
5354 //var conn = ConnectionInfo.Create("localhost", "admin", "zzxx", "Try1");
5455 //var pgw = WrapNpgsql.Create(conn);
5556
56- if ( _usepreamble ) pgw . RunSql ( Boilerplate . Preamble , "preamble" ) ;
57+ var bp = new Boilerplate ( ) ;
58+ if ( _usepreamble ) pgw . RunSql ( bp . Preamble ( ) , "preamble" ) ;
5759
5860 switch ( Path . GetExtension ( path ) ) {
5961 case ".andl" :
@@ -68,7 +70,7 @@ static void Main(string[] args) {
6870 throw ProgramError . Fatal ( $ "no action defined for { path } ") ;
6971 }
7072
71- if ( _usepostamble ) pgw . RunSql ( Boilerplate . Postamble , "postamble" ) ;
73+ if ( _usepostamble ) pgw . RunSql ( bp . Postamble ( ) , "postamble" ) ;
7274
7375 pgw . Close ( ) ;
7476 } catch ( ProgramException ex ) {
@@ -91,17 +93,16 @@ public class ConnectionInfo {
9193 public string Password { get ; set ; }
9294 public string Database { get ; set ; }
9395 public string AdoConnectionString {
94- get { return $ "Host={ Host } ;Username={ Username } ;password= { Password } ; Database={ Database } "; }
96+ get { return $ "Host={ Host } ;Username={ Username } ;Database={ Database } "; }
9597 }
9698 public string PgConnectionString {
97- get { return $ "host={ Host } user={ Username } password= { Password } dbname={ Database } "; }
99+ get { return $ "host={ Host } user={ Username } dbname={ Database } "; }
98100 }
99101
100- public static ConnectionInfo Create ( string host , string username , string password , string database ) {
102+ public static ConnectionInfo Create ( string host , string username , string database ) {
101103 return new ConnectionInfo {
102104 Host = host ,
103105 Username = username ,
104- Password = password ,
105106 Database = database ,
106107 } ;
107108 }
@@ -151,21 +152,45 @@ public static ScriptLines Create(TextReader reader) {
151152 /// </summary>
152153 public class Boilerplate {
153154 // preamble for loading plandl. note lines end in ';'
154- static string plandl_path = @"D:/MyDocs/dev/vs14/Andl/x64/Debug/plandl" ;
155- static string gateway_path = @"D:\MyDocs\dev\vs14\Andl\Debug\Andl.Gateway.dll" ;
156- static int _noisy { get { return Logger . Level ; } }
157-
158- public static string Preamble {
159- get { return $@ "
155+ const string _plandl_filename = @"x64\plandl.dll" ;
156+ static string _gateway_filename = @"Andl.Gateway.dll" ;
157+ string _base_path ;
158+ //static string plandl_path = @"D:/MyDocs/dev/vs14/Andl/x64/Debug/plandl";
159+ //static string gateway_path = @"D:\MyDocs\dev\vs14\Andl\Debug\Andl.Gateway.dll";
160+ int _noisy { get { return Logger . Level ; } }
161+
162+ public string Preamble ( ) {
163+ return $@ "
160164DROP FUNCTION IF EXISTS plandl_call_handler() CASCADE;
161- CREATE OR REPLACE FUNCTION plandl_call_handler() RETURNS language_handler AS '{ plandl_path } ' LANGUAGE C;
162- CREATE OR REPLACE LANGUAGE plandl HANDLER plandl_call_handler;
165+ CREATE OR REPLACE FUNCTION plandl_call_handler() RETURNS language_handler
166+ AS '{ PlandlPath ( ) } ' LANGUAGE C;
167+ CREATE OR REPLACE LANGUAGE plandl HANDLER plandl_call_handler;
163168CREATE OR REPLACE FUNCTION plandl_compile(program text, source text) returns text
164- AS '{ gateway_path } |Noisy={ _noisy } ' LANGUAGE plandl;" ; } // '|Debug,Noisy=2'
169+ AS '{ GatewayPath ( ) } |Noisy={ _noisy } ' LANGUAGE plandl;" ; // '|Debug,Noisy=2'
170+ }
171+
172+ public string Postamble ( ) {
173+ return @"DROP FUNCTION plandl_call_handler() CASCADE;" ;
174+ }
175+
176+ string PlandlPath ( ) {
177+ var path = Path . Combine ( _base_path , _plandl_filename ) ;
178+ if ( ! File . Exists ( path ) )
179+ throw ProgramError . Fatal ( $ "File not found: { path } .") ;
180+ return path ;
181+ }
182+
183+ string GatewayPath ( ) {
184+ var path = Path . Combine ( _base_path , _gateway_filename ) ;
185+ if ( ! File . Exists ( path ) )
186+ throw ProgramError . Fatal ( $ "File not found: { path } .") ;
187+ return path ;
165188 }
166189
167- public static string Postamble {
168- get { return @"DROP FUNCTION plandl_call_handler() CASCADE;" ; }
190+ public Boilerplate ( ) {
191+ var fn = AppDomain . CurrentDomain . BaseDirectory ;
192+ _base_path = Path . GetDirectoryName ( fn ) ;
193+ //_base_path = Path.GetDirectoryName(Environment.GetCommandLineArgs()[0]);
169194 }
170195 }
171196
0 commit comments