From 4347819b7dc00b1bee19c754b32a0828aa6f50df Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 18 Jan 2011 11:21:02 +0200
Subject: Add support for native SQL statement execution

New test: mysql/native. New manual section: 3.9, "Executing Native SQL
Statements".
---
 mysql/makefile          |  1 +
 mysql/native/driver.cxx | 66 ++++++++++++++++++++++++++++++++++++++
 mysql/native/makefile   | 85 +++++++++++++++++++++++++++++++++++++++++++++++++
 mysql/native/test.std   |  0
 4 files changed, 152 insertions(+)
 create mode 100644 mysql/native/driver.cxx
 create mode 100644 mysql/native/makefile
 create mode 100644 mysql/native/test.std

(limited to 'mysql')

diff --git a/mysql/makefile b/mysql/makefile
index c5af184..05400dc 100644
--- a/mysql/makefile
+++ b/mysql/makefile
@@ -7,6 +7,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 
 tests :=      \
 template      \
+native        \
 truncation    \
 types
 
diff --git a/mysql/native/driver.cxx b/mysql/native/driver.cxx
new file mode 100644
index 0000000..1141860
--- /dev/null
+++ b/mysql/native/driver.cxx
@@ -0,0 +1,66 @@
+// file      : mysql/native/driver.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test native SQL execution.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/mysql/database.hxx>
+#include <odb/mysql/transaction.hxx>
+
+#include <common/common.hxx>
+
+using namespace std;
+using namespace odb;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    // Create the database schema.
+    //
+    {
+      transaction t (db->begin ());
+
+      db->execute ("DROP TABLE IF EXISTS test");
+      db->execute ("CREATE TABLE test (n INT PRIMARY KEY) ENGINE=InnoDB");
+
+      t.commit ();
+    }
+
+    // Insert a few rows.
+    //
+    {
+      transaction t (db->begin ());
+
+      assert (db->execute ("INSERT INTO test (n) VALUES (1)") == 1);
+      assert (db->execute ("INSERT INTO test (n) VALUES (2)") == 1);
+
+      t.commit ();
+    }
+
+    // Select a few rows.
+    //
+    {
+      transaction t (db->begin ());
+
+      assert (db->execute ("SELECT n FROM test WHERE n < 3") == 2);
+      assert (db->execute ("SELECT n FROM test WHERE n > 3") == 0);
+
+      t.commit ();
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/mysql/native/makefile b/mysql/native/makefile
new file mode 100644
index 0000000..b3e616b
--- /dev/null
+++ b/mysql/native/makefile
@@ -0,0 +1,85 @@
+# file      : mysql/native/makefile
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
+cxx_od  := $(cxx_obj:.o=.o.d)
+
+common.l             := $(out_root)/libcommon/common/common.l
+common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
+
+driver  := $(out_base)/driver
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
+
+# Build.
+#
+$(driver): $(cxx_obj) $(common.l)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+$(dist): sources := $(cxx_tun)
+$(dist): data_dist := test.std
+$(dist): export name := $(notdir $(src_base))
+$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \
+$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters
+$(dist):
+	$(call dist-data,$(sources) $(data_dist))
+	$(call meta-automake,../template/Makefile.am)
+	$(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj)
+	$(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj)
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+>$(out_base)/test.out)
+	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
+	$(call message,,rm -f $(out_base)/test.out)
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+	$(call message,,rm -f $(out_base)/test.out)
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+# How to.
+#
+$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(bld_root)/cxx/cxx-d.make)
+$(call include,$(bld_root)/cxx/cxx-o.make)
+$(call include,$(bld_root)/cxx/o-e.make)
+
+# Dependencies.
+#
+$(call import,$(src_root)/libcommon/makefile)
diff --git a/mysql/native/test.std b/mysql/native/test.std
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.1