55// You can obtain one at https://github.com/gogf/gf.
66//
77// Note:
8- // 1. It needs manually import: _ "github.com/mattn /go-oci8 "
8+ // 1. It needs manually import: _ "github.com/sijms /go-ora/v2 "
99// 2. It does not support Save/Replace features.
1010// 3. It does not support LastInsertId.
1111
@@ -16,12 +16,7 @@ import (
1616 "context"
1717 "database/sql"
1818 "fmt"
19- "reflect"
20- "strconv"
21- "strings"
22- "time"
23-
24- _ "github.com/mattn/go-oci8"
19+ gora "github.com/sijms/go-ora/v2"
2520
2621 "github.com/gogf/gf/v2/container/gmap"
2722 "github.com/gogf/gf/v2/database/gdb"
@@ -30,6 +25,8 @@ import (
3025 "github.com/gogf/gf/v2/text/gregex"
3126 "github.com/gogf/gf/v2/text/gstr"
3227 "github.com/gogf/gf/v2/util/gconv"
28+ "strconv"
29+ "strings"
3330)
3431
3532// Driver is the driver for oracle database.
@@ -65,20 +62,26 @@ func (d *Driver) New(core *gdb.Core, node *gdb.ConfigNode) (gdb.DB, error) {
6562func (d * Driver ) Open (config * gdb.ConfigNode ) (db * sql.DB , err error ) {
6663 var (
6764 source string
68- underlyingDriverName = "oci8 "
65+ underlyingDriverName = "oracle "
6966 )
70- // [username/[password]@]host[:port][/service_name][?param1=value1&...¶mN=valueN]
67+
68+ options := map [string ]string {
69+ "CONNECTION TIMEOUT" : "60" ,
70+ "PREFETCH_ROWS" : "25" ,
71+ }
72+
73+ if config .Debug {
74+ options ["TRACE FILE" ] = "oracle_trace.log"
75+ }
76+ // [username:[password]@]host[:port][/service_name][?param1=value1&...¶mN=valueN]
7177 if config .Link != "" {
7278 source = config .Link
7379 // Custom changing the schema in runtime.
7480 if config .Name != "" {
7581 source , _ = gregex .ReplaceString (`@(.+?)/([\w\.\-]+)+` , "@$1/" + config .Name , source )
7682 }
7783 } else {
78- source = fmt .Sprintf (
79- "%s/%s@%s:%s/%s" ,
80- config .User , config .Pass , config .Host , config .Port , config .Name ,
81- )
84+ source = gora .BuildUrl (config .Host , gconv .Int (config .Port ), config .Name , config .User , config .Pass , options )
8285 }
8386
8487 if db , err = sql .Open (underlyingDriverName , source ); err != nil {
@@ -99,8 +102,8 @@ func (d *Driver) FilteredLink() string {
99102 return ""
100103 }
101104 s , _ := gregex .ReplaceString (
102- `(.+?)\s*/ \s*(.+)\s*@\s*(.+)\s*:\s*(\d+)\s*/\s*(.+)` ,
103- `$1/ xxx@$3:$4/$5` ,
105+ `(.+?)\s*: \s*(.+)\s*@\s*(.+)\s*:\s*(\d+)\s*/\s*(.+)` ,
106+ `$1: xxx@$3:$4/$5` ,
104107 linkInfo ,
105108 )
106109 return s
@@ -124,16 +127,7 @@ func (d *Driver) DoFilter(ctx context.Context, link gdb.Link, sql string, args [
124127 return fmt .Sprintf (":v%d" , index )
125128 })
126129 newSql , _ = gregex .ReplaceString ("\" " , "" , newSql )
127- // Handle string datetime argument.
128- for i , v := range args {
129- if reflect .TypeOf (v ).Kind () == reflect .String {
130- valueStr := gconv .String (v )
131- if gregex .IsMatchString (`^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$` , valueStr ) {
132- // args[i] = fmt.Sprintf(`TO_DATE('%s','yyyy-MM-dd HH:MI:SS')`, valueStr)
133- args [i ], _ = time .ParseInLocation ("2006-01-02 15:04:05" , valueStr , time .Local )
134- }
135- }
136- }
130+
137131 newSql = d .parseSql (newSql )
138132 newArgs = args
139133 return
@@ -168,16 +162,24 @@ func (d *Driver) parseSql(sql string) string {
168162 strings .EqualFold (queryExpr [3 ], "LIMIT" ) == false {
169163 break
170164 }
171- first , limit := 0 , 0
165+ page , limit := 0 , 0
172166 for i := 1 ; i < len (allMatch [index ]); i ++ {
173167 if len (strings .TrimSpace (allMatch [index ][i ])) == 0 {
174168 continue
175169 }
176170
177171 if strings .HasPrefix (allMatch [index ][i ], "LIMIT" ) {
178172 if allMatch [index ][i + 2 ] != "" {
179- first , _ = strconv .Atoi (allMatch [index ][i + 1 ])
173+ page , _ = strconv .Atoi (allMatch [index ][i + 1 ])
180174 limit , _ = strconv .Atoi (allMatch [index ][i + 2 ])
175+
176+ if page <= 0 {
177+ page = 1
178+ }
179+
180+ limit = (page / limit + 1 ) * limit
181+
182+ page , _ = strconv .Atoi (allMatch [index ][i + 1 ])
181183 } else {
182184 limit , _ = strconv .Atoi (allMatch [index ][i + 1 ])
183185 }
@@ -187,8 +189,8 @@ func (d *Driver) parseSql(sql string) string {
187189 sql = fmt .Sprintf (
188190 "SELECT * FROM " +
189191 "(SELECT GFORM.*, ROWNUM ROWNUM_ FROM (%s %s) GFORM WHERE ROWNUM <= %d)" +
190- " WHERE ROWNUM_ >= %d" ,
191- queryExpr [1 ], queryExpr [2 ], limit , first ,
192+ " WHERE ROWNUM_ > %d" ,
193+ queryExpr [1 ], queryExpr [2 ], limit , page ,
192194 )
193195 }
194196 return sql
@@ -241,7 +243,7 @@ SELECT
241243 CASE DATA_TYPE
242244 WHEN 'NUMBER' THEN DATA_TYPE||'('||DATA_PRECISION||','||DATA_SCALE||')'
243245 WHEN 'FLOAT' THEN DATA_TYPE||'('||DATA_PRECISION||','||DATA_SCALE||')'
244- ELSE DATA_TYPE||'('||DATA_LENGTH||')' END AS TYPE
246+ ELSE DATA_TYPE||'('||DATA_LENGTH||')' END AS TYPE,NULLABLE
245247FROM USER_TAB_COLUMNS WHERE TABLE_NAME = '%s' ORDER BY COLUMN_ID` ,
246248 strings .ToUpper (table ),
247249 )
@@ -256,10 +258,16 @@ FROM USER_TAB_COLUMNS WHERE TABLE_NAME = '%s' ORDER BY COLUMN_ID`,
256258 }
257259 fields = make (map [string ]* gdb.TableField )
258260 for i , m := range result {
259- fields [strings .ToLower (m ["FIELD" ].String ())] = & gdb.TableField {
261+ isNull := false
262+ if m ["NULLABLE" ].String () == "Y" {
263+ isNull = true
264+ }
265+
266+ fields [m ["FIELD" ].String ()] = & gdb.TableField {
260267 Index : i ,
261- Name : strings .ToLower (m ["FIELD" ].String ()),
262- Type : strings .ToLower (m ["TYPE" ].String ()),
268+ Name : m ["FIELD" ].String (),
269+ Type : m ["TYPE" ].String (),
270+ Null : isNull ,
263271 }
264272 }
265273 return fields
@@ -288,10 +296,10 @@ func (d *Driver) DoInsert(
288296) (result sql.Result , err error ) {
289297 switch option .InsertOption {
290298 case gdb .InsertOptionSave :
291- return nil , gerror .NewCode (gcode .CodeNotSupported , `Save operation is not supported by mssql driver` )
299+ return nil , gerror .NewCode (gcode .CodeNotSupported , `Save operation is not supported by oracle driver` )
292300
293301 case gdb .InsertOptionReplace :
294- return nil , gerror .NewCode (gcode .CodeNotSupported , `Replace operation is not supported by mssql driver` )
302+ return nil , gerror .NewCode (gcode .CodeNotSupported , `Replace operation is not supported by oracle driver` )
295303 }
296304
297305 var (
0 commit comments