Quick Save

Author: rsdoiel

Makefile

@@ -76,12 +76,12 @@ test: $(PACKAGE)
 #	cd timefmt && go test
 	cd codemeta && go test
 
+man: $(MAN_PAGES)
+
 $(MAN_PAGES): .FORCE
 	mkdir -p man/man1
 	pandoc $@.md --from markdown --to man -s >man/man1/$@
 
-man: $(MAN_PAGES)
-
 website: .FORCE
 	cd how-to && make -f website.mak
 	make -f website.mak
@@ -107,7 +107,7 @@ clean:
 	#@if [ -d man ]; then rm -fR man; fi
 
 # NOTE: macOS causes problems if you copy a binary versus move it.
-install: build
+install: build man
 	@echo "Installing programs in $(PREFIX)/bin"
 	@for FNAME in $(PROGRAMS); do if [ -f ./bin/$$FNAME ]; then mv -v ./bin/$$FNAME $(PREFIX)/bin/$$FNAME; fi; done
 	@echo ""

about.html

@@ -25,7 +25,7 @@
 
 <section>
 <h1 id="about-this-software">About this software</h1>
-<h2 id="datatools-1.2.6">datatools 1.2.6</h2>
+<h2 id="datatools-1.2.8">datatools 1.2.8</h2>
 <h3 id="authors">Authors</h3>
 <ul>
 <li>R. S. Doiel</li>

about.md

@@ -11,7 +11,7 @@ authors:
     orcid: "https://orcid.org/0000-0003-0900-6903"
 
 repository-code: "https://github.com/caltechlibrary/datatools"
-version: 1.2.7
+version: 1.2.8
 license-url: "https://data.caltech.edu/license"
 keywords: [ "csv", "excel", "sql", "json", "yaml", "xlsx", "golang", "bash" ]
 
@@ -20,7 +20,7 @@ keywords: [ "csv", "excel", "sql", "json", "yaml", "xlsx", "golang", "bash" ]
 About this software
 ===================
 
-## datatools 1.2.7
+## datatools 1.2.8
 
 ### Authors
 

cmd/sql2csv/sql2csv.go

@@ -42,7 +42,12 @@ dsn_url
 : (string) A data source name in URL form where the "protocol" element
 identifies the database resource being accessed (e.g. "sqlite://",
 "mysql://", "postgres://"). A data source name are rescribed
-at <https://github.com/golang/go/wiki/SQLInterface>.
+at <https://go.dev/wiki/SQLInterface>. For the specificly supported
+datatabase connection strings see
+<https://pkg.go.dev/github.com/glebarez/go-sqlite>,
+<https://pkg.go.dev/github.com/go-sql-driver/mysql#readme-dsn-data-source-name>
+and <https://pkg.go.dev/github.com/lib/pq>
+
 
 header_row
 : (boolean) if true print a header row in the output, false for no 
@@ -112,20 +117,36 @@ configuration file
 : Force the line ending per row to carage return and
 line feed if true, false use line feed
 
-# EXAMPLE
+-sql FILENAME
+: Read sql statement from a file instead of the command line.
+
+# EXAMPLES
 
 Using the "dbcfg.json" configuration file, display ten rows
 from table "mytable" in database indicated in "dbcfg.json".
 
+~~~sql
   {app_name} dbcfg.json 'SELECT * FROM mytable LIMIT 10'
+~~~
 
 The CSV output is written standard out and can be redirected into
 a file if desired.
 
+~~~shell
   {app_name} dbcfg.json 'SELECT * FROM mytable LIMIT 10' \
       >ten-rows.csv
+~~~
+
+Read SQL from a file and connect to Postgres without SSL you
+can pass the `+"`"+`-sql`+"`"+` and `+"`"+`-dsn`+"`"+` options.
+
+~~~shell
+{app_name} \
+  -dsn "postgres://${USER}@/${DB_NAME}?sslmode=disable" \
+  -sql query.sql \
+  >my_data.csv
+~~~
 
-{app_name} {version}
 `
 )
 
@@ -148,6 +169,7 @@ func main() {
 	writeHeaderRow, useCRLF := sqlCfg.WriteHeaderRow, sqlCfg.UseCRLF
 	dsn, delimiter := "", ""
 	fName, stmt := "", ""
+	sqlFName := ""
 
 	// Handle options
 	flag.BoolVar(&showHelp, "help", showHelp, "display help")
@@ -157,6 +179,7 @@ func main() {
 	flag.BoolVar(&useCRLF, "use-crlf", useCRLF, "delimited rows with a carriage return and line feed")
 	flag.StringVar(&dsn, "dsn", dsn, "connect using the data source name provided in URL form")
 	flag.StringVar(&delimiter, "delimiter", "", "set the delimiter, defaults to comma")
+	flag.StringVar(&sqlFName, "sql", "", "read the SQL statement from a file, '-' will cause a read from standard input")
 	flag.Parse()
 	args := flag.Args()
 
@@ -184,8 +207,20 @@ func main() {
 	case 2:
 		fName, stmt = args[0], args[1]
 	default:
-		fmt.Fprintf(eout, "missing configuration and SQL query statement")
-		os.Exit(1)
+		if sqlFName == "" {
+			fmt.Fprintf(eout, "missing configuration and SQL query statement")
+			os.Exit(1)
+		}
+	}
+
+	// Read SQL from file if specified.
+	if sqlFName != "" {
+		src, err := os.ReadFile(sqlFName)
+		if err != nil {
+			fmt.Fprintf(eout, "%s\n", err)
+			os.Exit(1)
+		}
+		stmt = fmt.Sprintf("%s", src)
 	}
 
 	// Load configuration if provided

codemeta.json

@@ -5,12 +5,13 @@
     "codeRepository": "https://github.com/caltechlibrary/datatools",
     "dateCreated": "2017-02-06",
 	"dateRelease": "2023-10-02",
-	"dateModified": "2024-02-26",
+	"dateModified": "2024-02-27",
     "downloadUrl": "https://github.com/caltechlibrary/datatools/releases/",
     "issueTracker": "https://github.com/caltechlibrary/datatools/issues",
     "name": "datatools",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "description": "A set of command line tools for working with CSV, Excel Workbooks, JSON and structured text documents.",
+	"releaseNotes": "Maintenance, added -sql to sql2csv cli.",
     "applicationCategory": "computer programming",
     "developmentStatus": "active",
     "funder": {

codemeta2cff.1.md

@@ -1,4 +1,4 @@
-%codemeta2cff(1) user manual | version 1.2.7 ede8965
+%codemeta2cff(1) user manual | version 1.2.7 a2bbe4b
 % R. S. Doiel
 % 2024-02-27
 

csv2json.1.md

@@ -1,4 +1,4 @@
-%csv2json(1) user manual | version 1.2.7 ede8965
+%csv2json(1) user manual | version 1.2.7 a2bbe4b
 % R. S. Doiel
 % 2024-02-27
 

csv2mdtable.1.html

@@ -79,7 +79,7 @@ <h1 id="examples">EXAMPLES</h1>
 <pre><code>    cat data1.csv | csv2mdtable &gt; data1.md</code></pre>
 <p>Convert data1.csv to data1.md using options.</p>
 <pre><code>    csv2mdtable -i data1.csv -o data1.md</code></pre>
-<p>csv2mdtable 1.2.6</p>
+<p>csv2mdtable 1.2.7</p>
 </section>
 
 <footer>

csv2mdtable.1.md

@@ -1,4 +1,4 @@
-%csv2mdtable(1) user manual | version 1.2.7 ede8965
+%csv2mdtable(1) user manual | version 1.2.7 a2bbe4b
 % R. S. Doiel
 % 2024-02-27
 

csv2tab.1.html

@@ -56,7 +56,7 @@ <h1 id="examples">EXAMPLES</h1>
 <p>This would yield</p>
 <pre><code>    name    email   age
     Doe, Jane   [email protected]    42</code></pre>
-<p>csv2tab 1.2.6</p>
+<p>csv2tab 1.2.7</p>
 </section>
 
 <footer>