use a workflow for page

Author: konsumer

.github/workflows/page.yml

@@ -0,0 +1,30 @@
+name: Page
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build static files
+        id: build
+        run: cp -R src demo/sqldef
+
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: demo
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Node.js CI
+name: Test
 
 on: [push]
 

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 node_modules
 *.log
+*.sqlite

README.md

@@ -45,4 +45,8 @@ npm start
 
 # run all unit-tests
 npm t
+
+# use the CLI
+sqlite3 test.sqlite < test/sqlite3.sql
+./cli.mjs import -f test/sqlite3.sql -t sqlite3 -h test.sqlite
 ```

build.js

@@ -2,10 +2,10 @@
 
 import { readFile, writeFile } from 'node:fs/promises'
 
-const buf = await readFile('./go/sqldef.wasm')
+const buf = await readFile('./src/go/sqldef.wasm')
 
 await writeFile(
-  'index.js',
+  'src/index.js',
   `import './go/wasm_exec.js'
 const buf = new Uint8Array([${[...buf].join(',')}])
 const go = new Go()

cli.mjs

@@ -5,9 +5,8 @@ import yargs from 'yargs/yargs'
 import { hideBin } from 'yargs/helpers'
 import { cosmiconfig } from 'cosmiconfig'
 import Confirm from 'prompt-confirm'
-import SqliteDatabase from 'better-sqlite3'
-import mysql from 'mysql2/promise'
-import sqldef from './index.js'
+import sqldef from './src/index.js'
+import { getStructure, executeQuery } from './src/db.js'
 
 // get a reasonable port
 const getPort = (args) => {
@@ -24,40 +23,6 @@ const getPort = (args) => {
   }
 }
 
-// get the current structure of database, as text
-async function getStructure({ type, host, database, user, password, socket, port }) {
-  if (type === 'sqlite') {
-    const db = new SqliteDatabase(host)
-    const tables = db.prepare('SELECT sql FROM sqlite_master WHERE type = "table" AND name NOT LIKE "sqlite_%"').all()
-    return tables.map((t) => t.sql).join(';\n') + ';'
-  } else if (type === 'mysql') {
-    const connection = await mysql.createConnection({
-      host,
-      user,
-      password,
-      database,
-      socket,
-      port
-    })
-    const [tables] = await connection.query('SELECT table_name FROM information_schema.tables WHERE table_schema = ?', [database])
-    return (
-      (
-        await Promise.all(
-          tables.map(async (table) => {
-            const tableName = table.table_name
-            const [result] = await connection.query(`SHOW CREATE TABLE \`${tableName}\``)
-            if (result && result[0]) {
-              return result[0]['Create Table']
-            } else {
-              return ''
-            }
-          })
-        )
-      ).join(';\n') + ';'
-    )
-  }
-}
-
 // export the current database as a file
 async function handleExport({ file, type, host, database, user, password, socket, port }) {
   const current = await getStructure({ type, host, database, user, password, socket, port })
@@ -68,24 +33,27 @@ async function handleExport({ file, type, host, database, user, password, socket
 async function handleImport({ newStruct, type, host, database, user, password, socket, port, dry = false }) {
   const current = await getStructure({ type, host, database, user, password, socket, port })
   const diff = await sqldef(type, current, newStruct)
+  if (!diff.trim()) {
+    return ''
+  }
   if (dry) {
-    console.log(diff)
-    return
+    return diff
   }
+  await executeQuery({ host, database, user, password, socket, port, query: diff })
 }
 
 const explorer = cosmiconfig('sqldef')
 const r = (await explorer.search()) || { config: {} }
 const { config = {} } = r
 yargs(hideBin(process.argv))
-  .demandCommand()
+  .demandCommand(1, 'You need to use a command (import/export)')
   .usage('Usage: $0 <command> [options]')
   .help('?')
   .alias('?', 'help')
 
   .alias('v', 'version')
-  .example('$0 export --user=cool --password=mysecret --database=mydatabase', 'Save your current schema, from your mysql database, in schema.sql')
-  .example('$0 import --user=cool --password=mysecret --database=mydatabase', 'Update your database to match schema.sql')
+  .example('$0 export', 'Save your current schema, from your mysql database, in schema.sql')
+  .example('$0 import', 'Update your database to match schema.sql')
 
   .command(
     'export',
@@ -105,9 +73,9 @@ yargs(hideBin(process.argv))
     (a) => {},
     async (args) => {
       const { file, type, host, database, user, password, socket, noConfirm, port = getPort(args) } = args
-      const newStruct = await readFile(file)
+      const newStruct = await readFile(file, 'utf8')
       if (!noConfirm) {
-        await handleImport({ file, type, host, database, user, password, socket, port, ...config, dry: true })
+        await handleImport({ newStruct, type, host, database, user, password, socket, port, ...config, dry: true })
         const prompt = new Confirm('Do you want to run this?')
         if (!(await prompt.run())) {
           console.error('Export canceled.')
@@ -129,6 +97,7 @@ yargs(hideBin(process.argv))
     alias: 'type',
     describe: 'The type of the database',
     nargs: 1,
+    choices: ['mysql', 'sqlite3', 'mssql', 'postgres'],
     default: config.type || 'mysql'
   })
 
@@ -176,7 +145,7 @@ yargs(hideBin(process.argv))
 
   .option('x', {
     alias: 'no-confirm',
-    describe: "Don't confirm before running the import/export",
+    describe: "Don't confirm before running the import",
     type: 'boolean',
     default: config['no-confirm']
   }).argv

docs/index.html renamed to demo/index.html

@@ -9,12 +9,13 @@
     "postgres"
   ],
   "exports": {
-    ".": "./index.js"
+    ".": "./src/index.js",
+    "./db": "./src/db.js"
   },
   "scripts": {
     "test": "node --test",
-    "start": "npx -y live-server docs --mount=/sqldef:.",
-    "build": "cd go && GOOS=js GOARCH=wasm tinygo build -target wasm -o sqldef.wasm sqldef-wasm.go && cp $(tinygo env TINYGOROOT)/targets/wasm_exec.js . && cd .. && node build.js"
+    "start": "npx -y live-server demo --mount=/sqldef:src",
+    "build": "cd src/go && GOOS=js GOARCH=wasm tinygo build -target wasm -o sqldef.wasm sqldef-wasm.go && cp $(tinygo env TINYGOROOT)/targets/wasm_exec.js . && cd ../.. && node build.js"
   },
   "author": "David Konsumer <[email protected]> (http://konsumer.js.org)",
   "license": "MIT",