database/sql: move from exp/sql

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5536076

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 0b8a1d16f1c18055cd657b0b9b6b83fae9373eb4..80cee4c8410362b5f3c2cd4f48c33da5a14b2aa7 100644 (file)
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -59,6 +59,8 @@ DIRS=\
        crypto/x509\
        crypto/x509/pkix\
        crypto/xtea\
+       database/sql\
+       database/sql/driver\
        debug/dwarf\
        debug/macho\
        debug/elf\
@@ -82,8 +84,6 @@ DIRS=\
        exp/gotype\
        exp/norm\
        exp/spdy\
-       exp/sql\
-       exp/sql/driver\
        exp/ssh\
        exp/terminal\
        exp/types\

diff --git a/src/pkg/exp/sql/Makefile b/src/pkg/database/sql/Makefile
similarity index 93%
rename from src/pkg/exp/sql/Makefile
rename to src/pkg/database/sql/Makefile
index 1e4f74c821873efdfbae9095d8e90b0141b1ec63..b8dd59a7f16d8d7c8ea9cb4875de7ead57070fe2 100644 (file)
--- a/src/pkg/exp/sql/Makefile
+++ b/src/pkg/database/sql/Makefile
@@ -4,7 +4,7 @@
 
 include ../../../Make.inc
 
-TARG=exp/sql
+TARG=database/sql
 GOFILES=\
        convert.go\
        sql.go\

diff --git a/src/pkg/exp/sql/convert.go b/src/pkg/database/sql/convert.go
similarity index 99%
rename from src/pkg/exp/sql/convert.go
rename to src/pkg/database/sql/convert.go
index feb79aeafe0b001f216bda09d8398e514d9b6e6f..9835e38de7e24c2e806640f4ec9b26d8857c7d28 100644 (file)
--- a/src/pkg/exp/sql/convert.go
+++ b/src/pkg/database/sql/convert.go
@@ -7,8 +7,8 @@
 package sql
 
 import (
+       "database/sql/driver"
        "errors"
-       "exp/sql/driver"
        "fmt"
        "reflect"
        "strconv"

diff --git a/src/pkg/exp/sql/convert_test.go b/src/pkg/database/sql/convert_test.go
similarity index 99%
rename from src/pkg/exp/sql/convert_test.go
rename to src/pkg/database/sql/convert_test.go
index 8c0cafc150f7687bbd92f3af5bc0b73e20d1bf0b..b188864f62328b965872b13f2b40b7e96b0cd9af 100644 (file)
--- a/src/pkg/exp/sql/convert_test.go
+++ b/src/pkg/database/sql/convert_test.go
@@ -5,7 +5,7 @@
 package sql
 
 import (
-       "exp/sql/driver"
+       "database/sql/driver"
        "fmt"
        "reflect"
        "testing"

diff --git a/src/pkg/exp/sql/doc.txt b/src/pkg/database/sql/doc.txt
similarity index 100%
rename from src/pkg/exp/sql/doc.txt
rename to src/pkg/database/sql/doc.txt

diff --git a/src/pkg/exp/sql/driver/Makefile b/src/pkg/database/sql/driver/Makefile
similarity index 90%
rename from src/pkg/exp/sql/driver/Makefile
rename to src/pkg/database/sql/driver/Makefile
index fce3f2c27c9b6d0bf027da190370c09c7ddead25..564aaa68999090d5ece9eb7c2be87c5cbadcae53 100644 (file)
--- a/src/pkg/exp/sql/driver/Makefile
+++ b/src/pkg/database/sql/driver/Makefile
@@ -4,7 +4,7 @@
 
 include ../../../../Make.inc
 
-TARG=exp/sql/driver
+TARG=database/sql/driver
 GOFILES=\
        driver.go\
        types.go\

diff --git a/src/pkg/exp/sql/driver/driver.go b/src/pkg/database/sql/driver/driver.go
similarity index 100%
rename from src/pkg/exp/sql/driver/driver.go
rename to src/pkg/database/sql/driver/driver.go

diff --git a/src/pkg/exp/sql/driver/types.go b/src/pkg/database/sql/driver/types.go
similarity index 100%
rename from src/pkg/exp/sql/driver/types.go
rename to src/pkg/database/sql/driver/types.go

diff --git a/src/pkg/exp/sql/driver/types_test.go b/src/pkg/database/sql/driver/types_test.go
similarity index 100%
rename from src/pkg/exp/sql/driver/types_test.go
rename to src/pkg/database/sql/driver/types_test.go

diff --git a/src/pkg/exp/sql/fakedb_test.go b/src/pkg/database/sql/fakedb_test.go
similarity index 99%
rename from src/pkg/exp/sql/fakedb_test.go
rename to src/pkg/database/sql/fakedb_test.go
index 0376583b68fa1218a5ac09e144ed7596f11ac15f..b0d137cd71568d08a3c9f1bb10bdf2573dbbbeca 100644 (file)
--- a/src/pkg/exp/sql/fakedb_test.go
+++ b/src/pkg/database/sql/fakedb_test.go
@@ -5,6 +5,7 @@
 package sql
 
 import (
+       "database/sql/driver"
        "errors"
        "fmt"
        "io"
@@ -13,8 +14,6 @@ import (
        "strings"
        "sync"
        "time"
-
-       "exp/sql/driver"
 )
 
 var _ = log.Printf

diff --git a/src/pkg/exp/sql/sql.go b/src/pkg/database/sql/sql.go
similarity index 99%
rename from src/pkg/exp/sql/sql.go
rename to src/pkg/database/sql/sql.go
index 3201e76674944ca356d32a60af62533099c358a4..a8bf2a8b00c933d9963f5c82681cbaaf2823070b 100644 (file)
--- a/src/pkg/exp/sql/sql.go
+++ b/src/pkg/database/sql/sql.go
@@ -7,12 +7,11 @@
 package sql
 
 import (
+       "database/sql/driver"
        "errors"
        "fmt"
        "io"
        "sync"
-
-       "exp/sql/driver"
 )
 
 var drivers = make(map[string]driver.Driver)

diff --git a/src/pkg/exp/sql/sql_test.go b/src/pkg/database/sql/sql_test.go
similarity index 100%
rename from src/pkg/exp/sql/sql_test.go
rename to src/pkg/database/sql/sql_test.go